From 9646ba4b026e4dbee0c0d5ac3d52b428bfef7b29 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 28 八月 2026 10:49:44 +0800
Subject: [PATCH] 新疆-新聚 1.销售台账中的销售合同按框架合同处理 2.设备台账需按车间/区域汇总设备，车间/位置可自行新增，且支持子父级递归 3.计量器具台账支持通过 Excel 文件批量新增数据 4.设备保养定时任务新增“年度保养”任务频率
---
src/views/officeProcessAutomation/ApproveManage/approve-shared/useApprovalInstanceModule.js | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-shared/useApprovalInstanceModule.js b/src/views/officeProcessAutomation/ApproveManage/approve-shared/useApprovalInstanceModule.js
index 8dd8bba..6793523 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;
@@ -347,11 +357,11 @@
disabled: (row) => !canEditBusinessInstanceRow(row),
clickFun: (row) => openEdit(row),
},
- {
- name: "鍒犻櫎",
- type: "danger",
- clickFun: (row) => removeInstance(row),
- },
+ // {
+ // name: "鍒犻櫎",
+ // type: "danger",
+ // clickFun: (row) => removeInstance(row),
+ // },
...extraOperations,
];
}
--
Gitblit v1.9.3