From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js | 42 +++++++++++++++++++-----------------------
1 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js
index 4427e68..059ce55 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js
@@ -11,12 +11,15 @@
/**
* 初始化表格的列
*/
+
+var type = $("#type").val()
TCompetition.initColumn = function () {
return [
{field: 'selectItem', radio: true},
- {title: '所在省', field: 'province', visible: true, align: 'center', valign: 'middle',width:'8%',
+ {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
+ {title: '所在省', field: 'province', visible: type==2?false:true, align: 'center', valign: 'middle',width:'8%',
},
- {title: '所在市', field: 'city', visible: true, align: 'center', valign: 'middle'},
+ {title: '所在市', field: 'city', visible: type==2?false:true, align: 'center', valign: 'middle'},
{title: '举办门店', field: 'storeName', visible: true, align: 'center', valign: 'middle',width:'8%',
},
{title: '赛事名称', field: 'name', visible: true, align: 'center', valign: 'middle',width:'8%',
@@ -25,7 +28,7 @@
},
{title: '结束时间', field: 'endTime', visible: true, align: 'center', valign: 'middle',width:'5%',
},
- {title: '最大人数-已报名人数', field: 'applicantsNumber', visible: true, align: 'center', valign: 'middle',width:'8%',
+ {title: '最大人数-已报名人数', field: 'count', visible: true, align: 'center', valign: 'middle',width:'8%',
},
{title: '报名条件', field: 'registerCondition', visible: true, align: 'center', valign: 'middle',width:'8%',
formatter:function (data) {
@@ -35,6 +38,11 @@
{title: '状态', field: 'status', visible: true, align: 'center', valign: 'middle',width:'8%',
formatter:function (data) {
return {1:"未开始",2:"已开始",3:"已结束",4:"已取消"}[data]
+ }
+ },
+ {title: '审核状态', field: 'auditStatus', visible: type==2?true:false, align: 'center', valign: 'middle',width:'8%',
+ formatter:function (data) {
+ return {1:"待审核",2:"已通过",3:"已拒绝"}[data]
}
},
];
@@ -130,6 +138,7 @@
this.layerIndex = index;
}
};
+
TCompetition.user = function () {
if (this.check()) {
var index = layer.open({
@@ -151,37 +160,24 @@
if (this.check()) {
var nickname = TCompetition.seItem.carLicensePlate;
if (nickname == "" || nickname == null || nickname == undefined){
- nickname = "该车辆";
+ nickname = "该赛事";
}else{
nickname = "【"+nickname+"】";
}
swal({
- title: language==1?"您是否确认删除" + nickname + "?":(language==2?"Are you sure to delete the" + nickname + "?":"Apakah Anda pasti akan menghapus" + nickname + "?"),
- text: language==1?"请谨慎操作！":(language==2?' Please operate with caution!':'Harap beroperasi dengan hati -hati!'),
+ title: "您是否确认取消" + nickname + "?",
+ text: "请谨慎操作！",
type: "warning",
showCancelButton: true,
confirmButtonColor: "#DD6B55",
- confirmButtonText: language==1?"删除":(language==2?'Delete':'Hapus'),
+ confirmButtonText: "确定",
closeOnConfirm: true
}, function () {
- var ajax = new $ax(Feng.ctxPath + "/TCompetition/delete", function (data) {
- if(language==1){
- swal("删除成功", "您已经成功删除了" + nickname + "。", "success");
- }else if(language==2){
- swal("Delete succeeded!", "You have successfully deleted it" + nickname + "。", "success");
- }else {
- swal("Hapus berhasil!", "Anda berhasil menghapus" + nickname + "。", "success");
- }
+ var ajax = new $ax(Feng.ctxPath + "/tCompetition/cancel", function (data) {
+ swal("取消成功", "您已经成功取消了" + nickname + "。", "success");
TCompetition.table.refresh();
}, function (data) {
- if(language==1){
- swal("删除失败", data.responseJSON.message + "！", "warning");
- }else if(language==2){
- swal("Failed to delete", data.responseJSON.message + "！", "warning");
- }else {
- swal("Hapus Gagal", data.responseJSON.message + "！", "warning");
- }
-
+ swal("取消失败", data.responseJSON.message + "！", "warning");
});
ajax.set("TCompetitionId",TCompetition.seItem.id);
ajax.start();
--
Gitblit v1.7.1