From 856f10107b7681f91114dc48991ebd121a3a8c3f Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期四, 21 五月 2026 15:20:30 +0800
Subject: [PATCH] 查询条件分类查询区分
---
src/pages/oa/_utils/approvalFormField.js | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/pages/oa/_utils/approvalFormField.js b/src/pages/oa/_utils/approvalFormField.js
index 1215674..813d05e 100644
--- a/src/pages/oa/_utils/approvalFormField.js
+++ b/src/pages/oa/_utils/approvalFormField.js
@@ -17,17 +17,25 @@
datetime: "YYYY-MM-DD HH:mm:ss",
};
-/** 瑙ｆ瀽 formConfig JSON */
+/** 瑙ｆ瀽 formConfig JSON锛堝惈宓屽 formPayload锛屼笌 Web parseInstanceFormConfig 涓�鑷达級 */
export function parseApprovalFormConfig(raw) {
- if (!raw) return { prompt: "", fields: [] };
+ if (!raw) return { prompt: "", fields: [], formPayload: {} };
try {
const obj = typeof raw === "string" ? JSON.parse(raw) : raw;
+ const payload = obj?.formPayload;
return {
- prompt: obj?.prompt || "",
- fields: Array.isArray(obj?.fields) ? obj.fields : [],
+ prompt: obj?.prompt || obj?.summaryPlaceholder || "",
+ summaryPlaceholder: obj?.summaryPlaceholder || "",
+ approvalType: obj?.approvalType || "",
+ fields: Array.isArray(obj?.fields)
+ ? obj.fields
+ : Array.isArray(obj?.formFields)
+ ? obj.formFields
+ : [],
+ formPayload: payload && typeof payload === "object" ? payload : {},
};
} catch {
- return { prompt: "", fields: [] };
+ return { prompt: "", fields: [], formPayload: {} };
}
}
@@ -45,6 +53,7 @@
valueMap[field.key] = val;
}
});
+ Object.assign(valueMap, instance.formPayload || {});
const baseFields = template.fields.length ? template.fields : instance.fields;
return {
prompt: instance.prompt || template.prompt,
--
Gitblit v1.9.3