From 6fc42b742367a9a042104a5ef9231ba639a8752a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 03 六月 2026 13:44:02 +0800
Subject: [PATCH] 英泽防锈 1.审批管理页面添加逻辑修改 2.车辆管理页面开发联调
---
src/views/officeProcessAutomation/ApproveManage/approve-shared/useApprovalTemplateBinding.js | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-shared/useApprovalTemplateBinding.js b/src/views/officeProcessAutomation/ApproveManage/approve-shared/useApprovalTemplateBinding.js
index de056d2..4572da7 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-shared/useApprovalTemplateBinding.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-shared/useApprovalTemplateBinding.js
@@ -17,6 +17,7 @@
} from "../approve-list/approveListConstants.js";
import {
getApprovalModuleConfig,
+ getModuleMatchingBusinessTypes,
resolveModuleBusinessType,
} from "./approvalModuleRegistry.js";
import {
@@ -60,10 +61,29 @@
return "";
});
+ const matchingBusinessTypes = computed(() => {
+ if (fixedBusinessType != null && fixedBusinessType !== "") return [fixedBusinessType];
+ if (isUniversal) {
+ const t = selectedBusinessType.value;
+ return t != null && t !== "" ? [t] : [];
+ }
+ if (moduleKey) {
+ return getModuleMatchingBusinessTypes(moduleKey, businessTypeOptions.value);
+ }
+ const t = resolvedBusinessType.value;
+ return t != null && t !== "" ? [t] : [];
+ });
+
const templateCards = computed(() => {
- const type = resolvedBusinessType.value;
- if (type == null || type === "") return [];
- return allTemplates.value.filter((card) => matchBusinessTypeValue(card.businessType, type));
+ const types = matchingBusinessTypes.value;
+ if (!types.length) return [];
+ return allTemplates.value.filter((card) =>
+ types.some(
+ (t) =>
+ matchBusinessTypeValue(card.businessType, t) ||
+ matchBusinessTypeValue(card.approvalType, t)
+ )
+ );
});
const activeTemplate = computed(() => bindingForm.templateSnapshot || null);
@@ -87,7 +107,17 @@
const selectedBusinessTypeLabel = computed(() => businessTypeLabel(resolvedBusinessType.value));
function countTemplatesByBusinessType(type) {
- return allTemplates.value.filter((card) => matchBusinessTypeValue(card.businessType, type)).length;
+ const types =
+ moduleKey && !fixedBusinessType
+ ? getModuleMatchingBusinessTypes(moduleKey, businessTypeOptions.value)
+ : [type];
+ return allTemplates.value.filter((card) =>
+ types.some(
+ (t) =>
+ matchBusinessTypeValue(card.businessType, t) ||
+ matchBusinessTypeValue(card.approvalType, t)
+ )
+ ).length;
}
async function loadTemplates() {
@@ -195,6 +225,7 @@
flowNodes: bindingForm.flowNodes,
templateAttachments: bindingForm.templateAttachments,
storageBlobDTOs: bindingForm.storageBlobDTOs,
+ formConfig: bindingForm.formConfig,
};
}
--
Gitblit v1.9.3