diff --git a/web/src/main/java/com/ibeetl/jlw/web/CompetitionController.java b/web/src/main/java/com/ibeetl/jlw/web/CompetitionController.java index 31c25c56..f5092082 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/CompetitionController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/CompetitionController.java @@ -88,10 +88,14 @@ public class CompetitionController{ return view; } + /** + *@author 姚丹 + *@data 2022/10/17 + */ @GetMapping(MODEL + "/add.do") @Function("competition.add") @ResponseBody - public ModelAndView add(Long competitionId) { + public ModelAndView add(Long competitionId,String sign) { ModelAndView view = new ModelAndView("/jlw/competition/add.html"); if(null != competitionId){ Competition competition = competitionService.queryById(competitionId); @@ -105,6 +109,7 @@ public class CompetitionController{ view.addObject("competition", new Competition()); view.addObject("competitionNewsList", new ArrayList()); } + view.addObject("sign", sign); return view; } diff --git a/web/src/main/resources/static/js/jlw/competition/index.js b/web/src/main/resources/static/js/jlw/competition/index.js index 6ecc37a7..24b037c4 100644 --- a/web/src/main/resources/static/js/jlw/competition/index.js +++ b/web/src/main/resources/static/js/jlw/competition/index.js @@ -91,43 +91,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { initToolBar:function(){ toolbar = { add : function() { // 获取选中数据 - layer.open({ - type:1, - title: '新增大赛', - btn: ['确定', '关闭'], - btnAlign: 'c', - area: ['440px', '170px'], - content: '
' + - '
' + - ' ' + - '
' + - ' ' + - ' ' + - '
' + - '
' + - '
' - ,success: function (layero, index) { - form.render(); - }, - yes: function (index, layero) { - var type = $("input[name='type']:checked").val(); - console.log(type) - if($.isEmpty(type)){ - Common.info("请选择大赛类型!!") - return; - } - if(type == '1'||type == 1){ - var url = "/jlw/competition/add.do"; - Common.openDlg(url,"大赛管理/新增大赛"); - }else { - } - - layer.close(index); - }, - btn2: function (index, layero) { - layer.close(index); - } - }); + openF("add"); }, refresh: function () {//刷新 searchForm.reset(); @@ -144,8 +108,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { }, initTableTool: table.on('tool(competitionTable)', function (obj) { var data = obj.data; if (obj.event === 'edit') { - var url = "/jlw/competition/add.do?competitionId="+data.competitionId; - Common.openDlg(url,"大赛管理/编辑大赛"); + openF("edit",data); }else if(obj.event === "del"){ layer.confirm('是否确定删除该大赛?', function (index) { var ret = Common.postAjax("/jlw/competition/delete.json", {ids: data.competitionId}); @@ -191,6 +154,55 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { return false; //阻止表单跳转。如果需要表单跳转,去掉这段即可。 });*/ + function openF(f,data){ + layer.open({ + type:1, + title: f == "add"?'新增大赛':'编辑大赛', + btn: ['确定', '关闭'], + btnAlign: 'c', + area: ['440px', '170px'], + content: '
' + + '
' + + ' ' + + '
' + + ' ' + + ' ' + + '
' + + '
' + + '
' + ,success: function (layero, index) { + form.render(); + }, + yes: function (index, layero) { + var type = $("input[name='type']:checked").val(); + if($.isEmpty(type)){ + Common.info("请选择大赛类型!!") + return; + } + if(f == "add"){ + if(type == '1'||type == 1){ + var url = "/jlw/competition/add.do?"+"sign=1"; + Common.openDlg(url,"大赛管理/新增大赛"); + }else { + var url = "/jlw/competition/add.do?"+"sign=2"; + Common.openDlg(url,"大赛管理/新增大赛"); + } + }else if(f == "edit"){ + if(type == '1'||type == 1){ + var url = "/jlw/competition/add.do?competitionId="+data.competitionId+"sign=1"; + Common.openDlg(url,"大赛管理/编辑大赛"); + }else { + var url = "/jlw/competition/add.do?competitionId="+data.competitionId+"sign=2"; + Common.openDlg(url,"大赛管理/编辑大赛"); + } + } + layer.close(index); + }, + btn2: function (index, layero) { + layer.close(index); + } + }); + }; exports('index',view); }); \ No newline at end of file diff --git a/web/src/main/resources/templates/jlw/competition/add.html b/web/src/main/resources/templates/jlw/competition/add.html index d011bc96..d8ff2def 100644 --- a/web/src/main/resources/templates/jlw/competition/add.html +++ b/web/src/main/resources/templates/jlw/competition/add.html @@ -80,14 +80,24 @@