From adb79299e86660a7f205466cf1ea48c6b25b1398 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:14:37 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对(未明确) 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检,抽检的话是抽多少百分比 6.供应商管理东西太少了,没有资质文件啊这些东西(是不是可以参考pro) 7.采购审批把人从李莹莹改成龙红星

---
 src/views/officeProcessAutomation/ApproveManage/approve-shared/useApprovalInstanceModule.js |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-shared/useApprovalInstanceModule.js b/src/views/officeProcessAutomation/ApproveManage/approve-shared/useApprovalInstanceModule.js
index 8dd8bba..b474bb2 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-shared/useApprovalInstanceModule.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-shared/useApprovalInstanceModule.js
@@ -29,6 +29,10 @@
 } from "../approve-template/selectOptionSource.js";
 import { enrichInstanceRowFromFormConfig } from "./approvalInstanceFormConfigTable.js";
 import {
+  filterInstanceRowsByModuleSearch,
+  hasActiveModuleSearch,
+} from "./approvalInstanceListSearch.js";
+import {
   getApprovalModuleConfig,
   getModuleListBusinessType,
   resolveModuleBusinessType,
@@ -146,8 +150,14 @@
       const caches = await fetchSelectOptionCaches(
         collectOptionSourcesFromFields(allFields)
       );
-      tableData.value = mapped.map((row) => mapListRow(row, caches));
-      page.total = total;
+      let rows = mapped.map((row) => mapListRow(row, caches));
+      if (hasActiveModuleSearch(moduleKey, searchForm)) {
+        rows = filterInstanceRowsByModuleSearch(moduleKey, rows, searchForm);
+      }
+      tableData.value = rows;
+      page.total = hasActiveModuleSearch(moduleKey, searchForm)
+        ? rows.length
+        : total;
     } catch {
       tableData.value = [];
       page.total = 0;

--
Gitblit v1.9.3