From be92cc11ccef44f326c2b0d3d4b8794e395c60ea Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期三, 21 十月 2026 16:10:44 +0800
Subject: [PATCH] 测试完成

---
 src/views/sfstatistics/percentage/components/SecondFollowUp.vue |  547 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 433 insertions(+), 114 deletions(-)

diff --git a/src/views/sfstatistics/percentage/components/SecondFollowUp.vue b/src/views/sfstatistics/percentage/components/SecondFollowUp.vue
index 88fe70e..f49c5f4 100644
--- a/src/views/sfstatistics/percentage/components/SecondFollowUp.vue
+++ b/src/views/sfstatistics/percentage/components/SecondFollowUp.vue
@@ -554,6 +554,223 @@
             :render-header="Tooltipsfl"
           />
           <el-table-column
+            v-if="isTargetHospital"
+            label="浜哄伐"
+            align="center"
+          >
+            <el-table-column
+              label="鍙戦�佸畬鎴�"
+              align="center"
+              key="manualAgain"
+              prop="manualAgain"
+              :render-header="Tooltipfswc"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  size="medium"
+                  type="text"
+                  @click="
+                    handleViewDetails(
+                      scope.row,
+                      'manualAgainInfo',
+                      '鍙戦�佸畬鎴愪汉宸ラ殢璁垮垪琛�'
+                    )
+                  "
+                >
+                  <span class="button-zx">{{ scope.row.manualAgain }}</span>
+                </el-button>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="鏈�缁堝畬鎴�"
+              align="center"
+              key="manualAgainSuccess"
+              prop="manualAgainSuccess"
+              :render-header="Tooltipzzwc"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  size="medium"
+                  type="text"
+                  @click="
+                    handleViewDetails(
+                      scope.row,
+                      'manualAgainSuccessInfo',
+                      '鏈�缁堝畬鎴愪汉宸ラ殢璁垮垪琛�'
+                    )
+                  "
+                >
+                  <span class="button-zx">{{
+                    scope.row.manualAgainSuccess
+                  }}</span>
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            v-if="isTargetHospital"
+            label="璇煶"
+            align="center"
+          >
+            <el-table-column
+              label="鍙戦�佸畬鎴�"
+              align="center"
+              key="voiceAgain"
+              prop="voiceAgain"
+              :render-header="Tooltipfswc"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  size="medium"
+                  type="text"
+                  @click="
+                    handleViewDetails(
+                      scope.row,
+                      'voiceAgainInfo',
+                      '鍙戦�佸畬鎴愯闊抽殢璁垮垪琛�'
+                    )
+                  "
+                >
+                  <span class="button-zx">{{ scope.row.voiceAgain }}</span>
+                </el-button>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="鏈�缁堝畬鎴�"
+              align="center"
+              key="voiceAgainSuccess"
+              prop="voiceAgainSuccess"
+              :render-header="Tooltipzzwc"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  size="medium"
+                  type="text"
+                  @click="
+                    handleViewDetails(
+                      scope.row,
+                      'voiceAgainSuccessInfo',
+                      '鏈�缁堝畬鎴愯闊抽殢璁垮垪琛�'
+                    )
+                  "
+                >
+                  <span class="button-zx">{{
+                    scope.row.voiceAgainSuccess
+                  }}</span>
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            v-if="isTargetHospital"
+            label="鐭俊"
+            align="center"
+          >
+            <el-table-column
+              label="鍙戦�佸畬鎴�"
+              align="center"
+              key="smsAgain"
+              prop="smsAgain"
+              :render-header="Tooltipfswc"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  size="medium"
+                  type="text"
+                  @click="
+                    handleViewDetails(
+                      scope.row,
+                      'smsAgainInfo',
+                      '鍙戦�佸畬鎴愮煭淇¢殢璁垮垪琛�'
+                    )
+                  "
+                >
+                  <span class="button-zx">{{ scope.row.smsAgain }}</span>
+                </el-button>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="鏈�缁堝畬鎴�"
+              align="center"
+              key="smsAgainSuccess"
+              prop="smsAgainSuccess"
+              :render-header="Tooltipzzwc"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  size="medium"
+                  type="text"
+                  @click="
+                    handleViewDetails(
+                      scope.row,
+                      'smsAgainSuccessInfo',
+                      '鏈�缁堝畬鎴愮煭淇¢殢璁垮垪琛�'
+                    )
+                  "
+                >
+                  <span class="button-zx">{{
+                    scope.row.smsAgainSuccess
+                  }}</span>
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            v-if="isTargetHospital"
+            label="寰俊"
+            align="center"
+          >
+            <el-table-column
+              label="鍙戦�佸畬鎴�"
+              align="center"
+              key="weChatAgain"
+              prop="weChatAgain"
+              :render-header="Tooltipfswc"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  size="medium"
+                  type="text"
+                  @click="
+                    handleViewDetails(
+                      scope.row,
+                      'weChatAgainInfo',
+                      '鍙戦�佸畬鎴愬井淇¢殢璁垮垪琛�'
+                    )
+                  "
+                >
+                  <span class="button-zx">{{ scope.row.weChatAgain }}</span>
+                </el-button>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="鏈�缁堝畬鎴�"
+              align="center"
+              key="weChatAgainSuccess"
+              prop="weChatAgainSuccess"
+              :render-header="Tooltipzzwc"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  size="medium"
+                  type="text"
+                  @click="
+                    handleViewDetails(
+                      scope.row,
+                      'wechatAgainSuccessInfo',
+                      '鏈�缁堝畬鎴愬井淇¢殢璁垮垪琛�'
+                    )
+                  "
+                >
+                  <span class="button-zx">{{
+                    scope.row.weChatAgainSuccess
+                  }}</span>
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            v-if="!isTargetHospital"
             label="浜哄伐"
             align="center"
             key="manualAgain"
@@ -576,6 +793,7 @@
             </template>
           </el-table-column>
           <el-table-column
+            v-if="!isTargetHospital"
             label="璇煶"
             align="center"
             key="voiceAgain"
@@ -594,6 +812,7 @@
             </template>
           </el-table-column>
           <el-table-column
+            v-if="!isTargetHospital"
             label="鐭俊"
             align="center"
             key="smsAgain"
@@ -616,6 +835,7 @@
             </template>
           </el-table-column>
           <el-table-column
+            v-if="!isTargetHospital"
             label="寰俊"
             align="center"
             key="weChatAgain"
@@ -681,6 +901,14 @@
       ids: [],
       tasktypes: store.getters.tasktypes,
     };
+  },
+  computed: {
+    isTargetHospital() {
+      return (
+        this.orgname == "绗竴浜烘皯鍖婚櫌婀栨花闄㈠尯" ||
+        this.orgname == "绗竴浜烘皯鍖婚櫌鍚村北闄㈠尯"
+      );
+    },
   },
   methods: {
     loadData() {
@@ -753,6 +981,32 @@
         [h("span", column.label)]
       );
     },
+    Tooltipfswc(h, { column }) {
+      return h(
+        "el-tooltip",
+        {
+          props: {
+            content: "棣栨鍙戦�佹偅鑰呭嵆濉姤鎴愬姛鐨勬暟閲�",
+            placement: "top",
+            effect: "dark",
+          },
+        },
+        [h("span", column.label)]
+      );
+    },
+    Tooltipzzwc(h, { column }) {
+      return h(
+        "el-tooltip",
+        {
+          props: {
+            content: "棣栨鏈畬鎴愪簩娆℃垨涓夋琛ュ伩鎺ㄩ�佹湰鏂瑰紡鐨勫畬鎴愭鏁�",
+            placement: "top",
+            effect: "dark",
+          },
+        },
+        [h("span", column.label)]
+      );
+    },
     getAllWardCodes() {
       return this.flatArrayhospit
         .filter((item) => item.value !== "all")
@@ -782,7 +1036,7 @@
     },
 
     getRowKey(row) {
-      return row.statisticaltype === 1
+      return this.queryParams.statisticaltype === 1
         ? row.leavehospitaldistrictcode
         : row.deptcode;
     },
@@ -1121,20 +1375,21 @@
           }
         }
 
-        // 鏍规嵁 serviceType 鐢熸垚闅忚绫诲瀷鍚嶇О
+        // 鏍规嵁 serviceType 鐢熸垚闅忚绫诲瀷鍚嶇О锛堝吋瀹瑰崟閫�/澶氶�夛級
+        const serviceTypes = Array.isArray(this.queryParams.serviceType)
+          ? this.queryParams.serviceType
+          : this.queryParams.serviceType
+          ? [this.queryParams.serviceType]
+          : [];
+
         let serviceTypeName = "鍑洪櫌闅忚"; // 鏂囦欢鍚嶄娇鐢ㄧ殑鍚嶇О
         let sheetTypeName = "鍐嶆闅忚"; // 宸ヤ綔琛ㄤ娇鐢ㄧ殑鍚嶇О锛堢畝鍖栫増锛�
-        console.log(this.queryParams.serviceType);
 
-        if (
-          this.queryParams.serviceType &&
-          Array.isArray(this.queryParams.serviceType) &&
-          this.queryParams.serviceType.length > 0
-        ) {
+        if (serviceTypes.length > 0) {
           if (this.tasktypes && Array.isArray(this.tasktypes)) {
             // 杩囨护鍑哄尮閰嶇殑闅忚绫诲瀷
             const matchedTypes = this.tasktypes.filter((task) =>
-              this.queryParams.serviceType.includes(task.value)
+              serviceTypes.includes(task.value)
             );
 
             if (matchedTypes.length === 1) {
@@ -1150,22 +1405,16 @@
               serviceTypeName = typeNames.join("/");
 
               // 宸ヤ綔琛ㄥ悕锛氫娇鐢ㄧ涓�涓被鍨嬫垨绠�鍖栧悕绉�
-              if (matchedTypes.length <= 2) {
-                // 濡傛灉鍙湁2涓被鍨嬶紝閮芥樉绀�
-                sheetTypeName = `${typeNames[0]}绛塦;
-              } else {
-                // 濡傛灉瓒呰繃2涓被鍨嬶紝鍙樉绀虹涓�涓�
-                sheetTypeName = `${typeNames[0]}绛塦;
-              }
-            } else if (this.queryParams.serviceType.length > 0) {
+              sheetTypeName = `${typeNames[0]}绛塦;
+            } else {
               // 濡傛灉娌℃湁鍖归厤鐨勶紝浣跨敤鍘熷鍊�
-              const typeStr = this.queryParams.serviceType.join("/");
+              const typeStr = serviceTypes.join("/");
               serviceTypeName = typeStr;
               sheetTypeName = "鍐嶆闅忚";
             }
-          } else if (this.queryParams.serviceType.length > 0) {
+          } else {
             // 濡傛灉娌℃湁 tasktypes锛屼娇鐢ㄥ師濮嬪��
-            const typeStr = this.queryParams.serviceType.join("/");
+            const typeStr = serviceTypes.join("/");
             serviceTypeName = typeStr;
             sheetTypeName = "鍐嶆闅忚";
           }
@@ -1496,92 +1745,154 @@
         },
       };
 
-      const titleText = `鍐嶆${serviceTypeName}缁熻琛╛${sheetNameSuffix}`;
-      // 娣诲姞鏍囬琛�
-      worksheet.mergeCells(1, 1, 1, 16);
-      const titleCell = worksheet.getCell(1, 1);
-      titleCell.value = titleText; // 浣跨敤鍔ㄦ�佹爣棰�
-      titleCell.style = titleStyle;
-      worksheet.getRow(1).height = 35;
+      // 鏄惁涓虹洰鏍囧尰闄紙浜哄伐/璇煶/鐭俊/寰俊 鎸� 鍙戦�佸畬鎴�/鏈�缁堝畬鎴� 鍒嗙骇灞曠ず锛�
+      const graded = this.isTargetHospital;
 
-      // 琛ㄥご
-      // 琛ㄥご闇�瑕佸鍔犳垚鍔熺巼鍒�
-      const secondRowHeaders = [
+      const baseHeaders = [
         "",
         "鍑洪櫌鐥呭尯",
         "绉戝",
         "鍑洪櫌浜烘",
         "鏃犻渶闅忚浜烘",
         "搴旈殢璁夸汉娆�",
+      ];
+      const coreHeaders = [
         "闇�闅忚",
         "寰呴殢璁�",
         "闅忚鎴愬姛",
         "闅忚澶辫触",
-        "鎴愬姛鐜�", // 鎴愬姛鐜囧簲璇ュ湪闅忚澶辫触鍚庨潰
-        "闅忚鐜�", // 闅忚鐜囧湪鎴愬姛鐜囧悗闈�
-        "浜哄伐",
-        "璇煶", // 淇锛氬簲璇ユ槸璇煶锛屼笉鏄煭淇�
-        "鐭俊", // 鐭俊
-        "寰俊", // 寰俊
+        "鎴愬姛鐜�",
+        "闅忚鐜�",
       ];
+      const methodGroups = this.getMethodColumns();
 
-      secondRowHeaders.forEach((header, index) => {
-        const cell = worksheet.getCell(3, index + 1);
-        cell.value = header;
-        cell.style = headerStyle;
-      });
+      const baseCount = baseHeaders.length; // 6
+      const coreCount = coreHeaders.length; // 6
+      const methodLeafCount = methodGroups.reduce(
+        (sum, g) => sum + g.fields.length,
+        0
+      ); // 8 鎴� 4
+      const totalCols = baseCount + coreCount + methodLeafCount; // 20 鎴� 16
+      const coreStartCol = baseCount + 1; // 7
+      const methodStartCol = baseCount + coreCount + 1; // 13
 
-      // 鏇存柊鍚堝苟鍗曞厓鏍肩殑鑼冨洿
-      for (let i = 1; i <= 6; i++) {
-        worksheet.mergeCells(2, i, 3, i);
-        const cell = worksheet.getCell(2, i);
-        cell.style = headerStyle;
+      const titleText = `鍐嶆${serviceTypeName}缁熻琛╛${sheetNameSuffix}`;
+      // 娣诲姞鏍囬琛�
+      worksheet.mergeCells(1, 1, 1, totalCols);
+      const titleCell = worksheet.getCell(1, 1);
+      titleCell.value = titleText;
+      titleCell.style = titleStyle;
+      worksheet.getRow(1).height = 35;
+
+      if (graded) {
+        // 琛ㄥご鍗� 3 琛岋紙绗�2/3/4琛岋級锛屾暟鎹粠绗�5琛屽紑濮�
+        const headerEndRow = 4;
+
+        // 绗�2琛岋細鍩虹鍒楃旱鍚戝悎骞� + 闅忚鍒嗙粍妯悜鍚堝苟
+        for (let i = 1; i <= baseCount; i++) {
+          worksheet.mergeCells(2, i, headerEndRow, i);
+          const cell = worksheet.getCell(2, i);
+          cell.value = baseHeaders[i - 1];
+          cell.style = headerStyle;
+        }
+        worksheet.mergeCells(2, coreStartCol, 2, totalCols);
+        worksheet.getCell(2, coreStartCol).value = "鍐嶆鍑洪櫌闅忚";
+        worksheet.getCell(2, coreStartCol).style = headerStyle;
+
+        // 绗�3琛岋細闅忚鏍稿績鍒楃旱鍚戝悎骞� + 闅忚鏂瑰紡鍒嗙粍妯悜鍚堝苟
+        for (let k = 0; k < coreCount; k++) {
+          const col = coreStartCol + k;
+          worksheet.mergeCells(3, col, headerEndRow, col);
+          const cell = worksheet.getCell(3, col);
+          cell.value = coreHeaders[k];
+          cell.style = headerStyle;
+        }
+        let mc = methodStartCol;
+        methodGroups.forEach((g) => {
+          if (g.fields.length > 1) {
+            worksheet.mergeCells(3, mc, 3, mc + g.fields.length - 1);
+          }
+          const cell = worksheet.getCell(3, mc);
+          cell.value = g.label;
+          cell.style = headerStyle;
+          mc += g.fields.length;
+        });
+
+        // 绗�4琛岋細闅忚鏂瑰紡瀛愬垪锛堝彂閫佸畬鎴�/鏈�缁堝畬鎴愶級
+        mc = methodStartCol;
+        methodGroups.forEach((g) => {
+          g.fields.forEach((field, idx) => {
+            const cell = worksheet.getCell(4, mc + idx);
+            cell.value = g.sub[idx];
+            cell.style = headerStyle;
+          });
+          mc += g.fields.length;
+        });
+
+        worksheet.getRow(2).height = 28;
+        worksheet.getRow(3).height = 24;
+        worksheet.getRow(4).height = 24;
+      } else {
+        // 琛ㄥご鍗� 2 琛岋紙绗�2/3琛岋級锛屾暟鎹粠绗�4琛屽紑濮�
+        const headerEndRow = 3;
+
+        for (let i = 1; i <= baseCount; i++) {
+          worksheet.mergeCells(2, i, headerEndRow, i);
+          const cell = worksheet.getCell(2, i);
+          cell.value = baseHeaders[i - 1];
+          cell.style = headerStyle;
+        }
+        worksheet.mergeCells(2, coreStartCol, 2, totalCols);
+        worksheet.getCell(2, coreStartCol).value = "鍐嶆鍑洪櫌闅忚";
+        worksheet.getCell(2, coreStartCol).style = headerStyle;
+
+        // 绗�3琛岋細闅忚鏍稿績鍒� + 闅忚鏂瑰紡鍒�
+        for (let k = 0; k < coreCount; k++) {
+          const cell = worksheet.getCell(3, coreStartCol + k);
+          cell.value = coreHeaders[k];
+          cell.style = headerStyle;
+        }
+        let mc = methodStartCol;
+        methodGroups.forEach((g) => {
+          const cell = worksheet.getCell(3, mc);
+          cell.value = g.label;
+          cell.style = headerStyle;
+          mc += 1;
+        });
+
+        worksheet.getRow(2).height = 28;
+        worksheet.getRow(3).height = 25;
       }
 
-      worksheet.getCell(2, 1).value = "";
-      worksheet.getCell(2, 2).value = "鍑洪櫌鐥呭尯";
-      worksheet.getCell(2, 3).value = "绉戝";
-      worksheet.getCell(2, 4).value = "鍑洪櫌浜烘";
-      worksheet.getCell(2, 5).value = "鏃犻渶闅忚浜烘";
-      worksheet.getCell(2, 6).value = "搴旈殢璁夸汉娆�";
-
-      // 娉ㄦ剰锛氱敱浜庡鍔犱簡鎴愬姛鐜囧垪锛屽悎骞跺垪鏁拌澧炲姞
-      worksheet.mergeCells(2, 7, 2, 16); // 浠�7鍚堝苟鍒�16锛堝師鏉ユ槸7-14锛�
-      worksheet.getCell(2, 7).value = "鍐嶆鍑洪櫌闅忚";
-      worksheet.getCell(2, 7).style = headerStyle;
-
-      worksheet.getRow(2).height = 28;
-      worksheet.getRow(3).height = 25;
-
       // 鏁版嵁琛�
+      const dataStartRow = graded ? 5 : 4;
       this.tableData.forEach((item, rowIndex) => {
-        const dataRow = worksheet.addRow(
-          [
-            "",
-            item.leavehospitaldistrictname || "",
-            item.deptname || "",
-            item.dischargeCount || 0,
-            item.nonFollowUp || 0,
-            item.followUpNeeded || 0,
-            item.needFollowUpAgain || 0,
-            item.pendingFollowUpAgain || 0,
-            item.followUpSuccessAgain || 0,
-            item.followUpFailAgain || 0,
-            // 鎴愬姛鐜� - 闇�瑕佸姩鎬佽绠�
-            this.calculateSuccessRate(
-              item.followUpSuccessAgain,
-              item.needFollowUpAgain,
-              item.pendingFollowUpAgain
-            ),
-            item.followUpRateAgain || "0%", // 闅忚鐜�
-            item.manualAgain || 0,
-            item.voiceAgain || 0,
-            item.smsAgain || 0,
-            item.weChatAgain || 0,
-          ],
-          rowIndex + 4
-        );
+        const rowValues = [
+          "",
+          item.leavehospitaldistrictname || "",
+          item.deptname || "",
+          item.dischargeCount || 0,
+          item.nonFollowUp || 0,
+          item.followUpNeeded || 0,
+          item.needFollowUpAgain || 0,
+          item.pendingFollowUpAgain || 0,
+          item.followUpSuccessAgain || 0,
+          item.followUpFailAgain || 0,
+          // 鎴愬姛鐜� - 闇�瑕佸姩鎬佽绠�
+          this.calculateSuccessRate(
+            item.followUpSuccessAgain,
+            item.needFollowUpAgain,
+            item.pendingFollowUpAgain
+          ),
+          item.followUpRateAgain || "0%", // 闅忚鐜�
+        ];
+        methodGroups.forEach((g) => {
+          g.fields.forEach((field) => {
+            rowValues.push(item[field] || 0);
+          });
+        });
 
+        const dataRow = worksheet.addRow(rowValues, rowIndex + dataStartRow);
         dataRow.eachCell((cell) => {
           cell.style = cellStyle;
         });
@@ -1600,24 +1911,27 @@
       summaryRow.height = 28;
 
       // 鍒楀
-      // 淇鍒楀
-      worksheet.columns = [
-        { width: 8 },
-        { width: 20 },
-        { width: 15 },
-        { width: 12 },
-        { width: 12 },
-        { width: 12 },
-        { width: 10 },
-        { width: 10 },
-        { width: 10 },
-        { width: 10 },
-        { width: 12 }, // 鎴愬姛鐜�
-        { width: 12 }, // 闅忚鐜�
-        { width: 8 }, // 浜哄伐
-        { width: 8 }, // 璇煶
-        { width: 8 }, // 鐭俊
-        { width: 8 }, // 寰俊
+      const widths = [8, 20, 15, 12, 12, 12, 10, 10, 10, 10, 12, 12];
+      methodGroups.forEach((g) => {
+        g.fields.forEach(() => widths.push(8));
+      });
+      worksheet.columns = widths.map((width) => ({ width }));
+    },
+    getMethodColumns() {
+      // 闅忚鏂瑰紡鍒楅厤缃細鐩爣鍖婚櫌鎸夆�滃彂閫佸畬鎴�/鏈�缁堝畬鎴愨�濆垎绾у睍绀�
+      if (this.isTargetHospital) {
+        return [
+          { label: "浜哄伐", fields: ["manualAgain", "manualAgainSuccess"], sub: ["鍙戦�佸畬鎴�", "鏈�缁堝畬鎴�"] },
+          { label: "璇煶", fields: ["voiceAgain", "voiceAgainSuccess"], sub: ["鍙戦�佸畬鎴�", "鏈�缁堝畬鎴�"] },
+          { label: "鐭俊", fields: ["smsAgain", "smsAgainSuccess"], sub: ["鍙戦�佸畬鎴�", "鏈�缁堝畬鎴�"] },
+          { label: "寰俊", fields: ["weChatAgain", "weChatAgainSuccess"], sub: ["鍙戦�佸畬鎴�", "鏈�缁堝畬鎴�"] },
+        ];
+      }
+      return [
+        { label: "浜哄伐", fields: ["manualAgain"], sub: ["浜哄伐"] },
+        { label: "璇煶", fields: ["voiceAgain"], sub: ["璇煶"] },
+        { label: "鐭俊", fields: ["smsAgain"], sub: ["鐭俊"] },
+        { label: "寰俊", fields: ["weChatAgain"], sub: ["寰俊"] },
       ];
     },
 
@@ -1635,11 +1949,14 @@
         0, // 9: followUpFailAgain
         "0%", // 10: 鎴愬姛鐜�
         "0%", // 11: 闅忚鐜�
-        0, // 12: manualAgain
-        0, // 13: voiceAgain
-        0, // 14: smsAgain
-        0, // 15: weChatAgain
       ];
+
+      const methodFields = this.getMethodColumns().reduce(
+        (arr, g) => arr.concat(g.fields),
+        []
+      );
+      const methodStartIndex = 12;
+      methodFields.forEach(() => summaries.push(0));
 
       this.tableData.forEach((item) => {
         summaries[3] += Number(item.dischargeCount) || 0;
@@ -1649,10 +1966,9 @@
         summaries[7] += Number(item.pendingFollowUpAgain) || 0;
         summaries[8] += Number(item.followUpSuccessAgain) || 0;
         summaries[9] += Number(item.followUpFailAgain) || 0;
-        summaries[12] += Number(item.manualAgain) || 0;
-        summaries[13] += Number(item.voiceAgain) || 0;
-        summaries[14] += Number(item.smsAgain) || 0;
-        summaries[15] += Number(item.weChatAgain) || 0;
+        methodFields.forEach((field, i) => {
+          summaries[methodStartIndex + i] += Number(item[field]) || 0;
+        });
       });
 
       // 鎴愬姛鐜囪绠�
@@ -1680,7 +1996,10 @@
       }
 
       // 鏍煎紡鍖栨暟瀛�
-      [3, 4, 5, 6, 7, 8, 9, 12, 13, 14, 15].forEach((index) => {
+      const numericIndices = [3, 4, 5, 6, 7, 8, 9].concat(
+        methodFields.map((_, i) => methodStartIndex + i)
+      );
+      numericIndices.forEach((index) => {
         summaries[index] = this.formatNumber(summaries[index]);
       });
 

--
Gitblit v1.9.3