From a1df9699594b0a0e46d26a0394eafb1eb030c68b Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期三, 20 五月 2026 17:42:09 +0800
Subject: [PATCH] 企业新闻
---
src/views/officeProcessAutomation/ApproveManage/approve-template/useApproveTemplate.js | 44 +++-----------------------------------------
1 files changed, 3 insertions(+), 41 deletions(-)
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-template/useApproveTemplate.js b/src/views/officeProcessAutomation/ApproveManage/approve-template/useApproveTemplate.js
index 3e27afb..0dbf2ca 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-template/useApproveTemplate.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-template/useApproveTemplate.js
@@ -6,13 +6,13 @@
TEMPLATE_TYPE_CUSTOM,
updateApprovalTemplate,
} from "@/api/officeProcessAutomation/approvalTemplate.js";
-import { getTypeEnums } from "@/api/basicData/enum.js";
import { Search } from "@element-plus/icons-vue";
import { ElMessage, ElMessageBox } from "element-plus";
import { reactive, ref } from "vue";
import {
buildApprovalTemplateListParams,
createEmptyTemplateForm,
+ fetchBusinessTypeOptions,
flowNodesSummary,
mapTemplateFromApi,
mapTemplateToApi,
@@ -23,38 +23,10 @@
} from "./approveTemplateConstants.js";
import { parseFormConfigToData } from "./formConfigUtils.js";
-const LEGACY_STORAGE_KEY = "oa_approve_template_custom_v1";
-
const FALLBACK_TEMPLATE_TYPE_OPTIONS = [
{ value: 0, label: "绯荤粺鍐呯疆" },
{ value: 1, label: "鑷畾涔�" },
];
-
-function unwrapEnumList(data) {
- if (Array.isArray(data)) return data;
- if (!data || typeof data !== "object") return [];
- if (Array.isArray(data.TypeEnums)) return data.TypeEnums;
- if (Array.isArray(data.typeEnums)) return data.typeEnums;
- const nested = Object.values(data).find((v) => Array.isArray(v));
- return nested || [];
-}
-
-function normalizeTypeEnumOptions(data) {
- return unwrapEnumList(data)
- .map((item) => {
- const rawValue = item?.value ?? item?.code ?? item?.businessType ?? item?.dictValue ?? item?.key;
- if (rawValue == null || rawValue === "") return null;
- const num = Number(rawValue);
- const value =
- typeof rawValue === "number" || (Number.isFinite(num) && String(rawValue).trim() !== "")
- ? num
- : rawValue;
- const label =
- item?.label ?? item?.name ?? item?.desc ?? item?.dictLabel ?? item?.text ?? String(value);
- return { label, value };
- })
- .filter(Boolean);
-}
function matchTemplateTypeValue(options, type) {
if (type == null || type === "") return false;
@@ -63,17 +35,7 @@
);
}
-function clearLegacyStorage() {
- try {
- localStorage.removeItem(LEGACY_STORAGE_KEY);
- } catch {
- /* ignore */
- }
-}
-
export function useApproveTemplate() {
- clearLegacyStorage();
-
const templateTypeOptions = ref([...FALLBACK_TEMPLATE_TYPE_OPTIONS]);
function templateTypeLabel(type) {
@@ -99,8 +61,7 @@
async function loadTemplateTypeOptions() {
try {
- const res = await getTypeEnums();
- const list = normalizeTypeEnumOptions(res?.data);
+ const list = await fetchBusinessTypeOptions();
templateTypeOptions.value = list.length ? list : [...FALLBACK_TEMPLATE_TYPE_OPTIONS];
} catch {
templateTypeOptions.value = [...FALLBACK_TEMPLATE_TYPE_OPTIONS];
@@ -237,6 +198,7 @@
),
enabled: row.enabled !== false,
flowNodes: JSON.parse(JSON.stringify(row.flowNodes || [base.flowNodes[0]])),
+ storageBlobDTOs: JSON.parse(JSON.stringify(row.storageBlobDTOs || [])),
});
}
--
Gitblit v1.9.3