From 3ce715a4e66955eac86dcd2f5c8afcfdf8becb6d Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 29 十月 2026 16:46:47 +0800
Subject: [PATCH] Merge origin/dev_项目管理 into dev_项目管理
---
src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js b/src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js
index 727f896..ff02425 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js
@@ -159,16 +159,16 @@
if (val == null || val === "") return "";
if (Array.isArray(val) && val.length >= 3) {
const [y, m, d, h = 0, min = 0, s = 0] = val;
- return dayjs(new Date(y, m - 1, d, h, min, s)).format("YYYY-MM-DD HH:mm:ss");
+ return dayjs(new Date(y, m - 1, d, h, min, s)).format("YYYY-MM-DD");
}
if (typeof val === "number") {
const d = val > 1e12 ? dayjs(val) : dayjs.unix(val);
- return d.isValid() ? d.format("YYYY-MM-DD HH:mm:ss") : "";
+ return d.isValid() ? d.format("YYYY-MM-DD") : "";
}
const s = String(val).trim();
if (!s) return "";
const parsed = dayjs(s.includes("T") ? s : s.replace(/-/g, "/"));
- return parsed.isValid() ? parsed.format("YYYY-MM-DD HH:mm:ss") : s;
+ return parsed.isValid() ? parsed.format("YYYY-MM-DD") : s;
}
export function formatDisplayTime(val) {
@@ -270,6 +270,9 @@
};
const kw = (searchForm?.keyword || "").trim();
if (kw) params.templateName = kw;
+ if (searchForm?.businessType != null && searchForm.businessType !== "") {
+ params.businessType = searchForm.businessType;
+ }
if (searchForm?.enabledOnly) params.enabled = "1";
return params;
}
--
Gitblit v1.9.3