diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionQuery.java index 44e5d487..ddb506e3 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionQuery.java @@ -16,15 +16,13 @@ public class TeacherOpenCourseScheduleSessionQuery extends PageParam { private Long teacherOpenCourseScheduleSessionId; @Query(name = "创建时间", display = false) private Date teacherOpenCourseScheduleSessionAddTime; - @Query(name = "状态", display = true,type=Query.TYPE_DICT,dict="global_status") -// @Query(name = "状态(1正常 2删除)", display = true,type=Query.TYPE_DICT,dict="global_status") - private Integer teacherOpenCourseScheduleSessionStatus; - - @Query(name = "开课名称", display = true,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1") + @Query(name = "课程名称", display = true,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1") private Long teacherOpenCourseId; @Query(name = "教师名称", display = true,type=Query.TYPE_DICT,dict="teacher.teacher_name.teacher_status=1") private Long teacherId; - @Query(name = "班级ID集合", display = true) + @Query(name = "启用状态", display = true,type=Query.TYPE_DICT,dict="global_status")/*状态(1正常 2删除)*/ + private Integer teacherOpenCourseScheduleSessionStatus; + @Query(name = "班级ID集合", display = false) private String schoolClassIds; @Query(name = "组织ID", display = false) private Long orgId; diff --git a/web/src/main/resources/static/js/jlw/schoolClass/index.js b/web/src/main/resources/static/js/jlw/schoolClass/index.js index ab0b942c..085f7401 100644 --- a/web/src/main/resources/static/js/jlw/schoolClass/index.js +++ b/web/src/main/resources/static/js/jlw/schoolClass/index.js @@ -4,6 +4,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { var table = layui.table; var schoolClassTable = null; var isSignRole = $("input[name='isSignRole']").val(); + console.log(isSignRole) var view ={ init:function(){ this.initTable(); @@ -13,7 +14,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { Lib.doSearchForm($("#searchForm"),schoolClassTable) } }, - initTable:function(){//isSignRole :1:admin 2:uniAdmin 3:teacher 4student + initTable:function(){ schoolClassTable = table.render({ elem : '#schoolClassTable', height : Lib.getTableHeight(), @@ -29,15 +30,15 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { cols : [ [ // 表头 { field : 'universitiesCollegesIdText', - title : '所属院校',align: "center",hide:isSignRole == 1?true:false //beTeacher :1是院校老师 2:不是 + title : '所属院校',align: "center",hide:isSignRole == 2?true:false //isSignRole :1:admin+管理员 2:uniAdmin学院管理员 3:teacher教师 4student学生 }, { field : 'universitiesCollegesIdText', - title : '所属院系',align: "center",hide:isSignRole == 1?true:false //beTeacher :1是院校老师 2:不是 + title : '所属院系',align: "center",hide:isSignRole == 1?true:false //isSignRole :1:admin+管理员 2:uniAdmin学院管理员 3:teacher教师 4student学生 }, { field : 'universitySystemIdText', - title : '专业名称',align: "center" + title : '专业名称',align: "center",hide:isSignRole == 1?true:false }, { field : 'className', @@ -45,7 +46,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { }, { field : 'classSn', - title : '班级编号',align: "center" + title : '班级编号',align: "center",hide:isSignRole == 2?true:false }, { diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js index 23e10496..96db1b3b 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js @@ -1,7 +1,8 @@ -layui.define([ 'form', 'laydate', 'table' ], function(exports) { +layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) { var form = layui.form; var laydate = layui.laydate; var table = layui.table; + var laytpl = layui.laytpl; var teacherOpenCourseScheduleSessionTable = null; var view ={ init:function(){ @@ -25,124 +26,81 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { // url : Common.ctxPath + '/jlw/teacherOpenCourseScheduleSession/list.json' // 数据接口 url : Common.ctxPath + '/jlw/teacherOpenCourseScheduleSession/listGroup.json' // 数据接口 ,page : Lib.tablePage // 开启分页 - ,toolbar: '#toolbar_teacherOpenCourseScheduleSession' //自定义头部左侧工具栏 - ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏 + /*,toolbar: '#toolbar_teacherOpenCourseScheduleSession' //自定义头部左侧工具栏 + ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏*/ ,limit : 10, cols : [ [ // 表头 { - type : 'checkbox', - + field: 'teacherOpenCourseIdText', + title: '开课名称', + align: "center", + hideField: false, + hide:$.isEmpty(sx_['teacherOpenCourseIdText'])?false:sx_['teacherOpenCourseIdText'], }, - { - field : 'teacherOpenCourseScheduleSessionId', - title : '课程开课-排课位置ID', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionId'])?false:sx_['teacherOpenCourseScheduleSessionId'], - - width : 60, - }, - { - field : 'teacherOpenCourseScheduleSessionDayTime', - title : '日期', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionDayTime'])?false:sx_['teacherOpenCourseScheduleSessionDayTime'], - }, { - field : 'teacherOpenCourseScheduleSessionStartDate', - title : '开始日期', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionStartDate'])?false:sx_['teacherOpenCourseScheduleSessionStartDate'], + field: 'teacherIdText', + title: '上课教师', + align: "center", + hideField: false, + hide: $.isEmpty(sx_['teacherIdText']) ? false : sx_['teacherIdText'], }, - { - field : 'teacherOpenCourseScheduleSessionEndDate', - title : '结束日期', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionEndDate'])?false:sx_['teacherOpenCourseScheduleSessionEndDate'], - }, - { - field : 'teacherOpenCourseScheduleSessionAddTime', - title : '创建时间', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionAddTime'])?false:sx_['teacherOpenCourseScheduleSessionAddTime'], - }, - { - field : 'teacherOpenCourseScheduleSessionStatusText', //数据字典类型为 global_status - // title : '状态(1正常 2删除)', - title : '状态', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionStatusText'])?false:sx_['teacherOpenCourseScheduleSessionStatusText'], - }, - { - field : 'teacherOpenCourseIdText', - title : '开课名称', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['teacherOpenCourseIdText'])?false:sx_['teacherOpenCourseIdText'], - }, - { - field : 'teacherIdText', - title : '教师名称', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['teacherIdText'])?false:sx_['teacherIdText'], - }, - { - field : 'schoolClassIds', - title : '班级ID集合', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['schoolClassIds'])?false:sx_['schoolClassIds'], - }, - // { - // field : 'orgId', - // title : '组织ID', - // align:"center", - // hideField :false, - // hide:$.isEmpty(sx_['orgId'])?false:sx_['orgId'], - // }, - // { - // field : 'userId', - // title : '用户ID', - // align:"center", - // hideField :false, - // hide:$.isEmpty(sx_['userId'])?false:sx_['userId'], - // }, - { - field : 'teacherOpenCourseScheduleSessionTagName', - title : '课次名称', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionTagName'])?false:sx_['teacherOpenCourseScheduleSessionTagName'], - }, - { - field : 'teacherOpenCourseScheduleSessionTagDuration', - title : '课程时长(分钟)', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionTagDuration'])?false:sx_['teacherOpenCourseScheduleSessionTagDuration'], - }, - { - field : 'teacherOpenCourseScheduleSessionTagStartTime', - title : '开始时间', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionTagStartTime'])?false:sx_['teacherOpenCourseScheduleSessionTagStartTime'], - }, - { - field : 'teacherOpenCourseScheduleSessionTagEndTime', - title : '结束时间', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionTagEndTime'])?false:sx_['teacherOpenCourseScheduleSessionTagEndTime'], - } - - ] ] + { + field: 'schoolClassInfo', + title: '上课班级', + align: "center", + hideField: false, + hide: $.isEmpty(sx_['schoolClassInfo']) ? false : sx_['schoolClassInfo'], + /*templet:function (d) { + return + }*/ + }, + { + field: 'look', + title: '上课时间', + align: "center", + hideField: false, + hide: $.isEmpty(sx_['look']) ? false : sx_['look'], + templet:function (d) { + return "查看" + } + }, + { + field: 'look', + title: '上课教室', + align: "center", + hideField: false, + hide: $.isEmpty(sx_['look']) ? false : sx_['look'] + }, + { + field: 'teacherOpenCourseScheduleSessionAddTime', + title: '创建时间', + align: "center", + hideField: false, + hide: $.isEmpty(sx_['teacherOpenCourseScheduleSessionAddTime']) ? false : sx_['teacherOpenCourseScheduleSessionAddTime'], + }, + { + field: 'teacherOpenCourseScheduleSessionStatusText', //数据字典类型为 global_status + // title : '状态(1正常 2删除)', + title: '启用状态', + align: "center", + hideField: false, + hide: $.isEmpty(sx_['teacherOpenCourseScheduleSessionStatusText']) ? false : sx_['teacherOpenCourseScheduleSessionStatusText'], + templet:function (d) { + var css = d.teacherOpenCourseScheduleSessionStatus == 2 ? "textType2" : 'textType'; + var text = d.teacherOpenCourseScheduleSessionStatus == 2 ? '禁用':'已启用' + return '' +text + '' + } + }, + { + field : 'userId',title : '操作',align:"center",width:200, templet: function (d) { + var htm = '编辑'; + htm += '启用'; + htm += '禁用'; + htm += '删除'; + return htm; + } + } + ] ] }); @@ -164,7 +122,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { toolbar = { add: function () { var url = "/jlw/teacherOpenCourseScheduleSession/add.do"; - Common.openDlg(url,"新增排课管理>新增"); + Common.openDlg(url,"排课管理>新增排课"); }, edit: function () { var data = Common.getOneFromTable(table,"teacherOpenCourseScheduleSessionTable"); @@ -214,9 +172,60 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { } }); }); + }else if(obj.event == 'look'){ + lookInfoDate(data); + } else if (obj.event == "enable") { + layer.confirm('是否确定启用该信息?', function (index) { + var ret = Common.postAjax("/jlw/teacherOpenCourseScheduleSession/edit.json", + {teacherOpenCourseId: data.teacherOpenCourseScheduleSessionId,teacherOpenCourseScheduleSessionStatus:1}); + layer.msg(ret.code == 0 ? "启用成功!" : ret.msg, { + offset: ['50%'], + icon: ret.code == 0 ? 1 : 2, + time: 1500 //2秒关闭(如果不配置,默认是3秒) + }, function () { + if (ret.code == 0) { + Lib.tableRefresh(); + } + }); + }); + } else if (obj.event == "disable") { + layer.confirm('是否确定禁用该信息?', function (index) { + var ret = Common.postAjax("/jlw/teacherOpenCourseScheduleSession/edit.json", + {ids: data.teacherOpenCourseScheduleSessionId,teacherOpenCourseScheduleSessionStatus:2}); + layer.msg(ret.code == 0 ? "禁用成功!" : ret.msg, { + offset: ['50%'], + icon: ret.code == 0 ? 1 : 2, + time: 1500 //2秒关闭(如果不配置,默认是3秒) + }, function () { + if (ret.code == 0) { + Lib.tableRefresh(); + } + }); + }); } }) - } + }; exports('index',view); - + function lookInfoDate(data) { + layer.open({ + type: 1, + title: '查看', + btnAlign: 'c', + closeBtn:true, + shadeClose:true, + area: ['850px', '400px'], + content: '
', + success: function (layero, index) { + var getTpl = lookInfoDate_demo.innerHTML + ,view = document.getElementById('lookInfoDate_view'); + laytpl(getTpl).render(data, function(html){ + view.innerHTML = html; + }); + }, + yes: function (index) {}, + btn2: function (index, layero) { + layer.close(index); + } + }); + } }); diff --git a/web/src/main/resources/templates/jlw/schoolClass/add.html b/web/src/main/resources/templates/jlw/schoolClass/add.html index 5329d28d..8d67c0fd 100644 --- a/web/src/main/resources/templates/jlw/schoolClass/add.html +++ b/web/src/main/resources/templates/jlw/schoolClass/add.html @@ -63,7 +63,6 @@ - +
-
-
-
- +
+ +
+ +
+
+
+
- +
-
-
- +
+
+
+
+
+
+
- +
-
-
-
-
-
-
- - +
+
+
+
+
+
+
- + +
-
-
- -
- +
+
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ +
+
+
+ +
+
-
-
-
+
+
+
- +
- -
-
-
- -
- +
-
-
-
- +
+
+
+
- +
-
-
- +
+
+
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ + + + + + + +
+
+
+ + + + - + diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/index.html index 407e3de5..9f72e549 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/index.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/index.html @@ -1,6 +1,32 @@ + +
+
+ 新增排课 + +
+
@@ -19,6 +45,37 @@
+