From bfa0b11dfbfe5b71e11f4544e688e4d9f325d1b5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 09 六月 2025 10:26:51 +0800
Subject: [PATCH] 修改bug和管理后台报表
---
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity.js
index 2b93c12..e147f72 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity.js
@@ -64,16 +64,16 @@
if (type == null) {
UserActivity.seItem = selected[0];
return true;
- } else if (type == 3 && selected[0].status != 6 && selected[0].status != 7) {
+ } else if (type == 3 && selected[0].status != 4 && selected[0].status != 5 && selected[0].status != 6) {
Feng.info("当前状态不能暂停/启动！");
return false;
- } else if (type == 3 && selected[0].status == 6 && (selected[0].startTime > new Date() || new Date() > selected[0].endTime)) {
+ } else if (type == 3 && (selected[0].status != 4 || selected[0].status != 5 || selected[0].status != 6) && (selected[0].startTime > new Date() || new Date() > selected[0].endTime)) {
Feng.info("当前状态不能暂停/启动！");
return false;
} else if (type == 1 && selected[0].status != 1) {
Feng.info("当前状态不能审核！");
return false;
- } else if (type == 2 && selected[0].status != 2 && new Date() >= new Date(selected[0].startTime.replace(/-/g, "/"))) {
+ } else if (type == 2 && ((selected[0].status != 1 && selected[0].status != 2 && selected[0].status != 5 && selected[0].status != 7) || new Date() >= new Date(selected[0].startTime.replace(/-/g, "/")))) {
Feng.info("当前状态不能编辑！");
return false;
}
--
Gitblit v1.7.1