diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeachingManagementController.java b/web/src/main/java/com/ibeetl/jlw/web/TeachingManagementController.java index 1df2f47b..f1d7f158 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeachingManagementController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeachingManagementController.java @@ -130,7 +130,7 @@ public class TeachingManagementController{ @GetMapping(MODEL + "/add.do") @Function("teachingManagement.add") @ApiOperation("后台管理系统界面-添加") - public ModelAndView add(Long teacherMergeClassThirdId, @SCoreUser CoreUser coreUser) { + public ModelAndView add(Long teacherMergeClassThirdId, @SCoreUser CoreUser coreUser,String schoolClassInfo) { ModelAndView view = new ModelAndView("/jlw/teachingManagement/add.html"); if(null != teacherMergeClassThirdId){ TeachingManagement teachingManagement = teachingManagementService.queryById(teacherMergeClassThirdId); @@ -138,6 +138,7 @@ public class TeachingManagementController{ }else { view.addObject("teachingManagement", new TeachingManagement()); } + view.addObject("schoolClassInfo", schoolClassInfo); // 如果是学校管理员则查询所在院校的信息 if (coreUser.isUniAdmin()) { UniversitiesColleges universitiesColleges = universitiesCollegesService.getByOrgId(coreUser.getOrgId()); diff --git a/web/src/main/resources/static/js/jlw/teachingManagement/index.js b/web/src/main/resources/static/js/jlw/teachingManagement/index.js index 40528ab6..e2534614 100644 --- a/web/src/main/resources/static/js/jlw/teachingManagement/index.js +++ b/web/src/main/resources/static/js/jlw/teachingManagement/index.js @@ -88,7 +88,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { return ; } var url = "/jlw/teachingManagement/add.do?teacherMergeClassThirdId="+data.teacherMergeClassThirdId; - Common.openDlg(url,"授课管理管理>"+data.teacherMergeClassThirdId+">编辑"); + Common.openDlg(url,"授课管理管理>编辑"); }, del: function () { layui.use(['del'], function(){ @@ -133,11 +133,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { }, initTableTool: table.on('tool(teachingManagementTable)', function (obj) { var data = obj.data; if (obj.event === 'edit') { - var url = "/jlw/teachingManagement/add.do?teacherMergeClassThirdId="+data.teacherMergeClassThirdId; - Common.openDlg(url,"授课管理管理>"+data.teacherMergeClassThirdId+">编辑"); + var url = "/jlw/teachingManagement/add.do?teacherMergeClassThirdId="+data.teacherMergeClassThirdId+"&schoolClassInfo="+data.schoolClassInfo; + Common.openDlg(url,"授课管理管理>编辑"); }else if(obj.event === "del"){ layer.confirm('是否确定删除该信息?', function (index) { - var ret = Common.postAjax("/jlw/teachingManagement/delete.json",{ids:data.teacherMergeClassThirdId}); + var ret = Common.postAjax("/jlw/teachingManagement/delete.json",{ids:data.teacherInfo}); layer.msg(ret.code == 0?"删除成功!":ret.msg, { offset: ['50%'], icon: ret.code == 0?1:2, diff --git a/web/src/main/resources/templates/jlw/teachingManagement/add.html b/web/src/main/resources/templates/jlw/teachingManagement/add.html index 56ba1a44..3ed24ad6 100644 --- a/web/src/main/resources/templates/jlw/teachingManagement/add.html +++ b/web/src/main/resources/templates/jlw/teachingManagement/add.html @@ -69,7 +69,7 @@