From 51e1b16fcef453674897b96df4466f3fb58b83f7 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 28 九月 2025 18:03:38 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity.js | 11 ++++++++---
1 files changed, 8 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 c358b41..a6a265a 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
@@ -17,6 +17,7 @@
{title: '', field: 'id', visible: false, align: 'center', valign: 'middle'},
{title: '添加时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle'},
{title: '活动名称', field: 'name', visible: true, align: 'center', valign: 'middle'},
+ {title: '所属企业', field: 'companyName', visible: true, align: 'center', valign: 'middle'},
{title: '开始时间', field: 'startTime', visible: true, align: 'center', valign: 'middle'},
{title: '结束时间', field: 'endTime', visible: true, align: 'center', valign: 'middle'},
{title: '参与人次', field: 'number', visible: true, align: 'center', valign: 'middle'},
@@ -73,7 +74,7 @@
} else if (type == 1 && selected[0].status != 1) {
Feng.info("当前状态不能审核！");
return false;
- } else if (type == 2 && ((selected[0].status != 1 && 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;
}
@@ -150,8 +151,12 @@
UserActivity.updateStatus = function () {
if (this.check(3)) {
var ajax = new $ax(Feng.ctxPath + "/userActivity/updateStatus", function (data) {
- Feng.success("启动/暂停成功!");
- UserActivity.table.refresh();
+ if(200 == data.code){
+ Feng.success("启动/暂停成功!");
+ UserActivity.table.refresh();
+ }else{
+ Feng.error(data.msg);
+ }
}, function (data) {
Feng.error("动/暂停失败!" + data.responseJSON.message + "!");
});
--
Gitblit v1.7.1