From 01db46e67c984de421dc6a31c87140b03f4740e7 Mon Sep 17 00:00:00 2001
From: wsm <8454518+new-twice@user.noreply.gitee.com>
Date: Tue, 7 Jul 2026 02:52:56 +0000
Subject: [PATCH] =?UTF-8?q?!86=20feat(inspectTask):=20=E5=8F=B0=E8=B4=A6?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E4=B8=9A=E5=8A=A1=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Merge branch 'master' of gitee.com:sz_30/supervision-vue into feature/…
* feat(inspectTask): 台账列表新增业务状态列
* feat(feedback): 反馈信息弹窗标题增加已完成条数统计
---
 .../components/BgXiSpeakFeedbackViewModal.vue | 10 ++++-
 .../DqInspectProgressFeedbackViewModal.vue    | 10 ++++-
 .../dq/inspectTask/DqInspectTask.data.ts      |  5 +++
 .../dq/inspectTask/DqInspectTaskList.vue      | 38 +++++++++++++++++--
 4 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/src/views/bg/xispeak/components/BgXiSpeakFeedbackViewModal.vue b/src/views/bg/xispeak/components/BgXiSpeakFeedbackViewModal.vue
index 23e781c..921ab26 100644
--- a/src/views/bg/xispeak/components/BgXiSpeakFeedbackViewModal.vue
+++ b/src/views/bg/xispeak/components/BgXiSpeakFeedbackViewModal.vue
@@ -110,9 +110,15 @@
     },
   ];
 
+  const completedCount = computed(() =>
+    feedbackTableData.value.filter((item) => item.completionStatus_dictText === '已完成').length
+  );
+
   const title = computed(() => {
-    const count = loading.value ? '加载中' : `${feedbackTableData.value.length} 条`;
-    return `办理情况（${count}）`;
+    if (loading.value) return '反馈信息（加载中）';
+    const total = feedbackTableData.value.length;
+    const done = completedCount.value;
+    return `反馈信息（共 ${total} 条，已完成 ${done} 条）`;
   });
 
   async function open(record: Recordable) {
diff --git a/src/views/dq/inspectProgress/components/DqInspectProgressFeedbackViewModal.vue b/src/views/dq/inspectProgress/components/DqInspectProgressFeedbackViewModal.vue
index 90bc0e9..2374f5c 100644
--- a/src/views/dq/inspectProgress/components/DqInspectProgressFeedbackViewModal.vue
+++ b/src/views/dq/inspectProgress/components/DqInspectProgressFeedbackViewModal.vue
@@ -49,9 +49,15 @@
   const loading = ref(false);
   const feedbackTableData = ref<Recordable[]>([]);
 
+  const completedCount = computed(() =>
+    feedbackTableData.value.filter((item) => item.bpmStatus_dictText === '已完成').length
+  );
+
   const title = computed(() => {
-    const count = loading.value ? '加载中' : `${feedbackTableData.value.length} 条`;
-    return `办理情况（${count}）`;
+    if (loading.value) return '反馈信息（加载中）';
+    const total = feedbackTableData.value.length;
+    const done = completedCount.value;
+    return `反馈信息（共 ${total} 条，已完成 ${done} 条）`;
   });
 
   const columns: BasicColumn[] = [
diff --git a/src/views/dq/inspectTask/DqInspectTask.data.ts b/src/views/dq/inspectTask/DqInspectTask.data.ts
index 8645e92..8e4c327 100644
--- a/src/views/dq/inspectTask/DqInspectTask.data.ts
+++ b/src/views/dq/inspectTask/DqInspectTask.data.ts
@@ -295,4 +295,9 @@ export const ledgerColumns: BasicColumn[] = [
     align:"center",
     dataIndex: 'taskStatus'
    },
+   {
+    title: '业务状态',
+    align:"center",
+    dataIndex: 'status_dictText'
+   },
 ];
diff --git a/src/views/dq/inspectTask/DqInspectTaskList.vue b/src/views/dq/inspectTask/DqInspectTaskList.vue
index c5e06bf..7731b2d 100644
--- a/src/views/dq/inspectTask/DqInspectTaskList.vue
+++ b/src/views/dq/inspectTask/DqInspectTaskList.vue
@@ -51,7 +51,7 @@
       </a-form>
     </div>
     <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+    <BasicTable @register="registerTable" :rowSelection="rowSelection" @fetch-success="onFetchSuccess">
       <!--插槽:table标题-->
       <template #tableTitle>
         <a-button type="primary" v-auth="'dqinspecttask:dq_inspect_task:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
@@ -153,7 +153,7 @@
   import Icon from '/@/components/Icon/index';
   import SzSelectDept from '/@/components/Form/src/jeecg/components/SzSelectDept.vue';
   import SzDeptUserModal from '/@/components/semri/deptUserComponent/SzDeptUserModal.vue';
-  import { startProcessSchedules } from '/@/api/common/api';
+  import { startProcessSchedules, getBusinessStatus } from '/@/api/common/api';
   import { dateUtil } from '/@/utils/dateUtil';
   import FlowScheduleStartModal from './components/DqInspectTaskFlowScheduleStartModal.vue';
   import BusinessProcessListModal from '/src/components/semri/process/BusinessProcessListModal.vue';
@@ -206,7 +206,7 @@
     },
   });
 
-  const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
+  const [registerTable, { reload, setTableData, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
 
   // 高级查询配置
   const superQueryConfig = reactive(superQuerySchema);
@@ -583,6 +583,38 @@
     reload();
   }
 
+  async function refreshBusinessStatus(records) {
+    if (!records || records.length === 0) return;
+    try {
+      const results = await Promise.all(
+        records.map((item) =>
+          getBusinessStatus({ businessId: item.id }).catch(() => null)
+        )
+      );
+      const statusMap: Record<string, string> = {};
+      for (const item of results) {
+        if (item?.businessId) {
+          statusMap[item.businessId] = item.status_dictText || '';
+        }
+      }
+      for (const item of records) {
+        const status = statusMap[item.id];
+        if (status !== undefined) {
+          item.status_dictText = status;
+        }
+      }
+    } catch (e) {
+      // 静默处理查询异常
+    }
+  }
+
+  async function onFetchSuccess(result) {
+    if (result?.items?.length > 0) {
+      await refreshBusinessStatus(result.items);
+      setTableData([...getDataSource()]);
+    }
+  }
+
   function handleFormJoinChange(key, value) {
     if (typeof value != 'string') {
       queryParam[key] = value.join(',');