diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourse/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourse/index.js index cef1dccb..0b062ba0 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourse/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourse/index.js @@ -192,7 +192,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) { }); }); } else if (obj.event == "toPaike") { - var teacherOpenCourseScheduleSessionTagTable = Common.postAjax('/jlw/teacherOpenCourseScheduleSessionTag/list.json').data;//开课节次数据表格 + var teacherOpenCourseScheduleSessionTagTable = Common.postAjax('/jlw/teacherOpenCourseScheduleSessionTag/listNew.json').data;//开课节次数据表格 var teacherOpenCourseScheduleSessionClassTable = Common.postAjax('/jlw/teacherOpenCourseScheduleSessionClass/list.json').data; if(teacherOpenCourseScheduleSessionTagTable.length <=0 || teacherOpenCourseScheduleSessionClassTable.length<=0){ Common.info("课次未设置 / 排课教室未设置,请先点击 ' 初始化排课条件设置 '进行设置"); 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 98e9be05..b4584c80 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js @@ -166,7 +166,7 @@ layui.define(['form', 'laydate', 'table', 'laytpl'], function (exports) { initToolBar: function () { toolbar = { add: function () { - var teacherOpenCourseScheduleSessionTagTable = Common.postAjax('/jlw/teacherOpenCourseScheduleSessionTag/list.json').data;//开课节次数据表格 + var teacherOpenCourseScheduleSessionTagTable = Common.postAjax('/jlw/teacherOpenCourseScheduleSessionTag/listNew.json').data;//开课节次数据表格 var teacherOpenCourseScheduleSessionClassTable = Common.postAjax('/jlw/teacherOpenCourseScheduleSessionClass/list.json').data; if(teacherOpenCourseScheduleSessionTagTable.length <=0 || teacherOpenCourseScheduleSessionClassTable.length<=0){ Common.info("课次未设置 / 排课教室未设置,请先点击 ' 初始化排课条件设置 '进行设置"); diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSessionTag/initSetCourseScheduleCondition.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSessionTag/initSetCourseScheduleCondition.js index c238b721..32856f61 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSessionTag/initSetCourseScheduleCondition.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSessionTag/initSetCourseScheduleCondition.js @@ -54,8 +54,9 @@ layui.define(['laydate', 'layer', 'form', 'table', 'treetable', 'element'], func height: Lib.getTableHeight(1), cellMinWidth: 100, method: 'post', - url: Common.ctxPath + "/jlw/teacherOpenCourseScheduleSessionTag/list.json" - /*,page : Lib.tablePage // 开启分页 + url: Common.ctxPath + "/jlw/teacherOpenCourseScheduleSessionTag/listNew.json" + /*url: Common.ctxPath + "/jlw/teacherOpenCourseScheduleSessionTag/list.json" + ,page : Lib.tablePage // 开启分页 ,toolbar: '#toolbar_teacherOpenCourseScheduleSessionTag' //自定义头部左侧工具栏 ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏*/ , limit: 100 @@ -127,7 +128,10 @@ layui.define(['laydate', 'layer', 'form', 'table', 'treetable', 'element'], func }, { field: 'operation_', title: '操作', align: "center", templet: function (d) { - var htm = '删除'; + var htm = ""; + if(d.defaultTemplate == 1){ + htm = '删除' + } return htm; } } @@ -251,6 +255,7 @@ layui.define(['laydate', 'layer', 'form', 'table', 'treetable', 'element'], func "teacherOpenCourseScheduleSessionTagName": "请输入课次名称", "teacherOpenCourseScheduleSessionTagStartTime": "00:00", "teacherOpenCourseScheduleSessionTagEndTime": "00:00", + "defaultTemplate":1 }; submitTag('', newRow);//添加课次 }