From 46aaa609357879e110b59b5b1aad4e54b0ed98f1 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期三, 07 二月 2024 15:39:28 +0800
Subject: [PATCH] 2.7
---
ManagementIGOTravel/guns-admin/target/classes/static/modular/system/userActivity/userActivity.js | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/target/classes/static/modular/system/userActivity/userActivity.js b/ManagementIGOTravel/guns-admin/target/classes/static/modular/system/userActivity/userActivity.js
index af78ee9..c36b3c5 100644
--- a/ManagementIGOTravel/guns-admin/target/classes/static/modular/system/userActivity/userActivity.js
+++ b/ManagementIGOTravel/guns-admin/target/classes/static/modular/system/userActivity/userActivity.js
@@ -28,15 +28,21 @@
}else if(value==2){
return "已驳回";
}else if(value==3){
- if(new Date()<new Date(row.startTime.replace(/-/g,"/"))){
- return "未开始";
- }else if(new Date()>new Date(row.endTime.replace(/-/g,"/"))){
- return "已结束";
- }else{
- return "进行中";
- }
+ // if(new Date()<new Date(row.startTime.replace(/-/g,"/"))){
+ // return "未开始";
+ // }else if(new Date()>new Date(row.endTime.replace(/-/g,"/"))){
+ // return "已结束";
+ // }else{
+ // return "进行中";
+ // }
}else if(value==4){
return "已暂停";
+ }else if(value==5){
+ return "未开始";
+ }else if(value==6){
+ return "进行中";
+ }else if(value==7){
+ return "已结束";
}
}
}
@@ -66,7 +72,7 @@
}else if(type==1 && selected[0].status!=1){
Feng.info("当前状态不能审核！");
return false;
- }else if(type==2 && selected[0].status!=2){
+ }else if(type==2 && selected[0].status!=2 && new Date()>=new Date(selected[0].startTime.replace(/-/g,"/"))){
Feng.info("当前状态不能编辑！");
return false;
}
--
Gitblit v1.7.1