From abd56663ec5395143e1509dab84e9379ee0ca36d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 15 八月 2026 17:47:19 +0800
Subject: [PATCH] fix: 日期格式化
---
src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js b/src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js
index 4d7d7a6..46bff6c 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js
@@ -1,6 +1,9 @@
import dayjs from "dayjs";
import { getTypeEnums } from "@/api/basicData/enum.js";
-import { TEMPLATE_TYPE_CUSTOM } from "@/api/officeProcessAutomation/approvalTemplate.js";
+import {
+ TEMPLATE_TYPE_BUILTIN,
+ TEMPLATE_TYPE_CUSTOM,
+} from "@/api/officeProcessAutomation/approvalTemplate.js";
import { APPROVAL_TYPE_OPTIONS } from "../approve-list/approveListConstants.js";
import {
buildFormConfigJson,
@@ -42,6 +45,11 @@
} catch {
return [];
}
+}
+
+/** 鏄惁涓虹郴缁熷唴缃ā鏉匡紙templateType === 0锛� */
+export function isBuiltinTemplate(row) {
+ return Number(row?.templateType) === TEMPLATE_TYPE_BUILTIN;
}
/** 鑺傜偣鍐呭鎵规柟寮忥細浼氱 / 鎴栫 */
@@ -168,6 +176,19 @@
return t || "鈥�";
}
+/** 鍙睍绀哄勾鏈堟棩 */
+export function formatDisplayDate(val) {
+ if (val == null || val === "") return "鈥�";
+ let d = null;
+ if (typeof val === "number") {
+ d = val > 1e12 ? dayjs(val) : dayjs.unix(val);
+ } else {
+ const s = String(val).trim();
+ d = dayjs(s.includes("T") ? s : s.replace(/-/g, "/"));
+ }
+ return d.isValid() ? d.format("YYYY-MM-DD") : String(val);
+}
+
/** 璇︽儏鎺ュ彛 data 瑙ｅ寘 */
export function unwrapTemplateDetail(res) {
const data = res?.data ?? res;
@@ -222,7 +243,8 @@
templateName: (form.templateName || "").trim(),
description: (form.description || "").trim(),
enabled: mapEnabledToApi(form.enabled),
- templateType: TEMPLATE_TYPE_CUSTOM,
+ templateType:
+ form.templateType != null ? Number(form.templateType) : TEMPLATE_TYPE_CUSTOM,
businessType: form.businessType ?? "",
formConfig: buildFormConfigJson(form.formConfigData),
nodes: nodes.map((n, i) => {
@@ -254,13 +276,10 @@
return dto;
}
-export function buildApprovalTemplateListParams({ page, searchForm, templateType = TEMPLATE_TYPE_CUSTOM }) {
+export function buildApprovalTemplateListParams({ page, searchForm }) {
const params = {
current: page.current,
size: page.size,
- templateType: searchForm?.templateType != null && searchForm.templateType !== ""
- ? searchForm.templateType
- : templateType,
};
const kw = (searchForm?.keyword || "").trim();
if (kw) params.templateName = kw;
@@ -290,6 +309,7 @@
templateName: "",
description: "",
templateType: TEMPLATE_TYPE_CUSTOM,
+ lockedFormFieldUids: [],
businessType: "",
formConfig: "",
formConfigData: createEmptyFormConfigData(),
--
Gitblit v1.9.3