From dbec90bbdc610ad997567afd31cdcee233434841 Mon Sep 17 00:00:00 2001
From: wsm <2746563060@qq.com>
Date: Wed, 12 Aug 2026 09:51:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(xispeak):=20=E7=9D=A3=E5=8A=9E=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=88=97=E6=94=B9=E4=B8=BA=E6=8C=89=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AE=9E=E6=97=B6=E6=8E=A8=E5=AF=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

无督办事项显示未开始，全部已完成显示已完成，有一个未完成显示督办中。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 src/views/bg/xispeak/BgXiSpeak.api.ts  |  8 +++++
 src/views/bg/xispeak/BgXiSpeak.data.ts |  7 ++++-
 src/views/bg/xispeak/BgXiSpeakList.vue | 41 +++++++++++++++++++++++---
 3 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/src/views/bg/xispeak/BgXiSpeak.api.ts b/src/views/bg/xispeak/BgXiSpeak.api.ts
index dd51bd4..6e37542 100644
--- a/src/views/bg/xispeak/BgXiSpeak.api.ts
+++ b/src/views/bg/xispeak/BgXiSpeak.api.ts
@@ -229,6 +229,14 @@ export const queryFeedbackCounts = (params) => {
   return defHttp.get({ url: '/bg/xispeak/bgXiSpeak/queryFeedbackCounts', params });
 };
 
+/**
+ * 查询业务督办状态（由关联流程实时推导：无流程=未开始/有运行=督办中/全部结束=已完成）
+ * @param params { businessId }
+ */
+export const getBusinessStatus = (params) => {
+  return defHttp.get({ url: '/tasktask/taskTask/getBusinessStatus', params });
+};
+
 /**
  * 更新 task_task 的部门经办人姓名
  * @param params { processInstanceId, deptHandlerName }
diff --git a/src/views/bg/xispeak/BgXiSpeak.data.ts b/src/views/bg/xispeak/BgXiSpeak.data.ts
index 1625c7c..b58d94d 100644
--- a/src/views/bg/xispeak/BgXiSpeak.data.ts
+++ b/src/views/bg/xispeak/BgXiSpeak.data.ts
@@ -125,8 +125,13 @@ export const columns: BasicColumn[] = [
   {
     title: '督办状态',
     align: 'center',
-    dataIndex: 'bpmStatus_dictText',
+    dataIndex: 'bpmStatus',
     width: 90,
+    customRender: ({ record }) => {
+      // 督办状态以关联流程实时推导结果为准（superviseStatus），未取到时才回退到存储值
+      const status = record?.superviseStatus ?? record?.bpmStatus;
+      return { '1': '未开始', '2': '督办中', '3': '已完成' }[status] ?? '';
+    },
   },
   // {
   //   title: '层深(最顶层节点层深为0)',
diff --git a/src/views/bg/xispeak/BgXiSpeakList.vue b/src/views/bg/xispeak/BgXiSpeakList.vue
index e61360d..cea8412 100644
--- a/src/views/bg/xispeak/BgXiSpeakList.vue
+++ b/src/views/bg/xispeak/BgXiSpeakList.vue
@@ -61,7 +61,7 @@
       :expandedRowKeys="expandedRowKeys"
       @expand="handleExpand"
       @fetch-success="onFetchSuccess"
-      :rowClassName="(r) => r.bpmStatus ? 'status-row-' + r.bpmStatus : ''"
+      :rowClassName="(r) => (r.superviseStatus || r.bpmStatus) ? 'status-row-' + (r.superviseStatus || r.bpmStatus) : ''"
     >
       <!--插槽:table标题-->
       <template #tableTitle>
@@ -174,6 +174,7 @@ import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervi
     withDrawXiSpeak,
     queryFeedbackCounts,
     statusStats,
+    getBusinessStatus,
   } from './BgXiSpeak.api';
 
   const FLOW_CODE = 'dev_bg_xi_speak_001';
@@ -389,7 +390,7 @@ import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervi
         result = result.records ? result.records : result;
         if (result && result.length > 0) {
           record.children = getDataByResult(result);
-          await refreshFeedbackCounts(record.children);
+          await Promise.all([refreshFeedbackCounts(record.children), refreshSuperviseStatus(record.children)]);
           // 触发表格重新渲染
           updateTableDataRecord(record.id, { ...record });
         } else {
@@ -472,14 +473,43 @@ import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervi
     }
   }
 
+  /**
+   * 批量刷新督办状态：以关联流程实时推导结果为准（无流程=未开始，有运行=督办中，全部结束=已完成）
+   */
+  async function refreshSuperviseStatus(records) {
+    const ids = collectAllIds(records).filter((id) => !String(id).includes('loadChild'));
+    if (ids.length === 0) return;
+    try {
+      const results = await Promise.allSettled(ids.map((id) => getBusinessStatus({ businessId: id })));
+      const statusMap: Record<string, string> = {};
+      results.forEach((res, index) => {
+        if (res.status === 'fulfilled' && res.value && res.value.status) {
+          statusMap[ids[index]] = res.value.status;
+        }
+      });
+      const updateFn = (list) => {
+        if (!list) return;
+        for (const item of list) {
+          if (statusMap[item.id]) {
+            item.superviseStatus = statusMap[item.id];
+          }
+          if (item.children) updateFn(item.children);
+        }
+      };
+      updateFn(records);
+    } catch (e) {
+      // 静默处理查询异常
+    }
+  }
+
   /**
    * 接口请求成功后回调
    */
   async function onFetchSuccess(result) {
     getDataByResult(result.items) && loadDataByExpandedRows();
     if (result.items && result.items.length > 0) {
-      await refreshFeedbackCounts(result.items);
-      // 触发表格重新渲染以显示更新后的 implCount / closedCount
+      await Promise.all([refreshFeedbackCounts(result.items), refreshSuperviseStatus(result.items)]);
+      // 触发表格重新渲染以显示更新后的 implCount / closedCount / 督办状态
       setTableData([...getDataSource()]);
     }
   }
@@ -516,6 +546,9 @@ import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervi
           }
         };
         fn(getDataSource());
+        await refreshSuperviseStatus(records);
+        // 触发表格重新渲染以显示子节点督办状态
+        setTableData([...getDataSource()]);
       }
     }
   }