Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

# Conflicts:
#	web/src/main/resources/static/js/jlw/universityFaculty/index.js
#	web/src/main/resources/static/js/jlw/universitySystem/index.js
#	web/src/main/resources/templates/jlw/schoolClass/add.html
#	web/src/main/resources/templates/jlw/universityFaculty/add.html
#	web/src/main/resources/templates/jlw/universitySystem/add.html
beetlsql3-dev
姚丹ab 2 years ago
commit 994a447ce1

@ -986,7 +986,18 @@ var Lib = {
$(key).empty();
$(key).append(htm);
layui.form.render();
},getUniversitySystems:function (key, classId){ //获取专业
},getUniversityFacultys:function (key, universitiesCollegesId){ //根据院校获取院系
var ret = Common.getAjax("/jlw/universityFaculty/getValues.json",{universitiesCollegesId: universitiesCollegesId});
var htm = '<option value="">请选择</option>';
if(ret.code == 0){
for (var i = 0;i < ret.data.length;i++){
htm += '<option value="'+ret.data[i].universityFacultyId+'">'+ret.data[i].universityFacultyName+'</option>';
}
}
$(key).empty();
$(key).append(htm);
layui.form.render();
},getUniversitySystems:function (key, classId){ //根据院系获取专业
var ret = Common.getAjax("/jlw/universitySystem/getValues.json",{universityFacultyId: classId});
var htm = '<option value="">请选择</option>';
if(ret.code == 0){

@ -38,7 +38,7 @@ public class UniversityFaculty extends BaseEntity{
private String universityFacultyContactAddress ;
//院校ID (院系的上一级)
@Dict(type = "universities_colleges.universities_colleges_name.universities_colleges_status=1")
private Long universitiesCollegesId ;
//状态( 1 正常 2删除

@ -43,9 +43,9 @@ public class UniversitySystem extends BaseEntity{
private Integer universitySystemStatus ;
//院系ID学院ID
@Dict(type="university_faculty.university_faculty_name.university_faculty_status=1")
private Long universityFacultyId ;
//用户ID
private Long userId ;

@ -8,8 +8,10 @@ import com.ibeetl.admin.core.file.FileService;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.jlw.entity.SchoolClass;
import com.ibeetl.jlw.entity.UniversitiesColleges;
import com.ibeetl.jlw.entity.UniversitySystem;
import com.ibeetl.jlw.service.SchoolClassService;
import com.ibeetl.jlw.service.UniversitiesCollegesService;
import com.ibeetl.jlw.service.UniversitySystemService;
import com.ibeetl.jlw.web.query.SchoolClassQuery;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -44,6 +46,8 @@ public class SchoolClassController{
@Resource private SchoolClassService schoolClassService;
@Resource private UniversitiesCollegesService universitiesCollegesService;
@Resource private UniversitySystemService systemService;
@Resource
FileService fileService;
@ -82,8 +86,11 @@ public class SchoolClassController{
if(classId != null){
SchoolClass schoolClass = schoolClassService.queryById(classId);
view.addObject("schoolClass", schoolClass);
UniversitySystem info = systemService.getInfo(schoolClass.getUniversitySystemId());
view.addObject("universityFacultyId", info.getUniversityFacultyId());
}else {
view.addObject("schoolClass",new SchoolClass());
view.addObject("universityFacultyId","");
}
view.addObject("beTeacher",null != coreUser && "JT_S_02".equals(coreUser.getJobType1())?1:2);//是否是教师 1是 2否
return view;

@ -69,6 +69,8 @@ public class StudentController{
@Resource private UniversitiesCollegesService universitiesCollegesService;
@Resource private UniversitySystemService universitySystemService;
@Resource private SchoolClassService schoolClassService;
@Resource private StudentDirectMessagesService studentDirectMessagesService;
@ -2011,11 +2013,14 @@ public class StudentController{
view.addObject("student", student);
universitiesColleges.setOrgId(student.getOrgId());
SchoolClass schoolClass = schoolClassService.queryById(student.getClassId());
UniversitySystem info = universitySystemService.getInfo(schoolClass.getUniversitySystemId());
view.addObject("universitySystemId", schoolClass != null ? schoolClass.getUniversitySystemId() : "");
view.addObject("universityFacultyId", info != null ? info.getUniversityFacultyId() : "");
}else {
view.addObject("student", new Student());
universitiesColleges.setOrgId(coreUser.getOrgId());
view.addObject("universitySystemId","");
view.addObject("universityFacultyId","");
}
List<UniversitiesColleges> universitiesCollegesList = universitiesCollegesService.getValues(universitiesColleges);
if(universitiesCollegesList.size() > 0){

@ -6,7 +6,9 @@ import com.ibeetl.admin.core.annotation.Function;
import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.file.FileService;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.jlw.entity.UniversityFaculty;
import com.ibeetl.jlw.entity.UniversitySystem;
import com.ibeetl.jlw.service.UniversityFacultyService;
import com.ibeetl.jlw.service.UniversitySystemService;
import com.ibeetl.jlw.web.query.UniversitySystemQuery;
import org.apache.commons.lang3.StringUtils;
@ -39,6 +41,8 @@ public class UniversitySystemController{
@Resource private UniversitySystemService universitySystemService;
@Resource private UniversityFacultyService facultyService;
@Resource
FileService fileService;
@ -109,9 +113,16 @@ public class UniversitySystemController{
ModelAndView view = new ModelAndView("/jlw/universitySystem/add.html");
if(null != universitySystemId){
UniversitySystem universitySystem = universitySystemService.queryById(universitySystemId);
UniversityFaculty universityFaculty = facultyService.queryById(universitySystem.getUniversityFacultyId());
if (universityFaculty != null) {
view.addObject("universitiesCollegesId", universityFaculty.getUniversitiesCollegesId());
}else {
view.addObject("universitiesCollegesId", "");
}
view.addObject("universitySystem", universitySystem);
}else {
view.addObject("universitySystem", new UniversitySystem());
view.addObject("universitiesCollegesId", "");
}
return view;
}

@ -55,6 +55,9 @@ layui.define([ 'form', 'laydate', 'table','schoolClassApi'], function(exports) {
Common.openDlg(url,"");
});
form.on('select(select_universitiesColleges)', function (obj) {
Lib.getUniversityFacultys($("select[name='universityFacultyId']"),obj.value);
});
form.on('select(select_universityFacultyIds)', function (obj) {
Lib.getUniversitySystems($("select[name='universitySystemId']"),obj.value);
});
exports('add',view);

@ -61,12 +61,17 @@ layui.define([ 'form', 'laydate', 'table','studentApi'], function(exports) {
Common.openDlg(url,"");
});
//根据所选学校查询班级
//根据所选学校查询院系
form.on('select(select_universitiesColleges)', function (obj) {
Lib.getUniversitySystems($("select[name='universitySystemId']"),obj.value);
Lib.getUniversityFacultys($("select[name='universityFacultyId']"),obj.value);
});
//查询专业
form.on('select(select_universityFacultyIds)', function (obj) {
Lib.getUniversitySystems($("select[name='universitySystemId']"),obj.value);
});
//查询班级
form.on('select(select_universitySystemId)', function (obj) {
Lib.getClassByUniSys($("select[name='classId']"),obj.value);
});

@ -1,140 +1,151 @@
layui.define(['form', 'laydate', 'table'], function (exports) {
layui.define([ 'form', 'laydate', 'table' ], function(exports) {
var form = layui.form;
var laydate = layui.laydate;
var table = layui.table;
var universityFacultyTable = null;
var view = {
init: function () {
var view ={
init:function(){
this.initTable();
this.initSearchForm();
this.initToolBar();
window.dataReload = function () {
Lib.doSearchForm($("#searchForm"), universityFacultyTable)
window.dataReload = function(){
Lib.doSearchForm($("#searchForm"),universityFacultyTable)
}
},
initTable: function () {
var sx_ = localStorage.getItem("universityFacultyTable_field_" + Common.userInfoId); //筛选值显示、隐藏缓存
if ($.isEmpty(sx_)) {
sx_ = {};
} else {
sx_ = JSON.parse(sx_);
}
initTable:function(){
var sx_ = localStorage.getItem("universityFacultyTable_field_"+Common.userInfoId); //筛选值显示、隐藏缓存
if($.isEmpty(sx_)){sx_ = {};}else {sx_ = JSON.parse(sx_);}
universityFacultyTable = table.render({
elem: '#universityFacultyTable',
height: Lib.getTableHeight(1),
elem : '#universityFacultyTable',
height : Lib.getTableHeight(1),
cellMinWidth: 100,
method: 'post',
url: Common.ctxPath + '/jlw/universityFaculty/list.json' // 数据接口
, page: Lib.tablePage // 开启分页
/*,toolbar: '#toolbar_universityFaculty' //自定义头部左侧工具栏*/
/*,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏*/
, limit: 10,
cols: [[ // 表头
/*{
method : 'post',
url : Common.ctxPath + '/jlw/universityFaculty/list.json' // 数据接口
,page : Lib.tablePage // 开启分页
,toolbar: '#toolbar_universityFaculty' //自定义头部左侧工具栏
,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏
,limit : 10,
cols : [ [ // 表头
{
type : 'checkbox',
},*/
{
field: 'universityFacultyId',
// title : '院系ID学院ID',
title: '院系ID',
align: "center",
hideField: false,
hide: $.isEmpty(sx_['universityFacultyId']) ?/*false*/true :/*sx_['universityFacultyId']*/true,
width: 60,
},
{
field: 'universityFacultyName',
title: '院系名称',
align: "center",
hideField: false,
hide: $.isEmpty(sx_['universityFacultyName']) ? false : sx_['universityFacultyName'],
},
{
field: 'universityFacultyContact',
title: '联系人',
align: "center",
hideField: false,
hide: $.isEmpty(sx_['universityFacultyContact']) ? false : sx_['universityFacultyContact'],
},
{
field: 'universityFacultyContactTel',
title: '联系人电话',
align: "center",
hideField: false,
hide: $.isEmpty(sx_['universityFacultyContactTel']) ? false : sx_['universityFacultyContactTel'],
},
{
field: 'universityFacultyContactAddress',
title: '联系人地址',
align: "center",
hideField: false,
hide: $.isEmpty(sx_['universityFacultyContactAddress']) ? false : sx_['universityFacultyContactAddress'],
},
// {
// field : 'universitiesCollegesId',
// title : '院校ID (院系的上一级)',
// align:"center",
// hideField :false,
// hide:$.isEmpty(sx_['universitiesCollegesId'])?false:sx_['universitiesCollegesId'],
// },
{
field: 'universityFacultyStatusText', //数据字典类型为 global_status
title: '状态',
// title : '状态( 1 正常 2删除',
align: "center",
hideField: false,
hide: true,/*$.isEmpty(sx_['universityFacultyStatusText']) ? false : sx_['universityFacultyStatusText'],*/
},
{
field: 'universityFacultyAddTime',
title: '创建时间',
align: "center",
hideField: false,
hide: $.isEmpty(sx_['universityFacultyAddTime']) ? false : sx_['universityFacultyAddTime'],
},
{
field: 'operation_', title: '操作', align: "center", templet: function (d) {
var htm = '<a class="layui-table-link" lay-event="edit">编辑</a>';
htm += '<a class="layui-table-link" lay-event="del">删除</a>';
return htm;
}
{
field : 'universityFacultyId',
// title : '院系ID学院ID',
title : '院系ID',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['universityFacultyId'])?false:sx_['universityFacultyId'],
width : 60,
},
{
field : 'universityFacultyName',
title : '院系名称',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['universityFacultyName'])?false:sx_['universityFacultyName'],
},
{
field : 'universityFacultyContact',
title : '联系人',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['universityFacultyContact'])?false:sx_['universityFacultyContact'],
},
{
field : 'universityFacultyContactTel',
title : '联系人电话',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['universityFacultyContactTel'])?false:sx_['universityFacultyContactTel'],
},
{
field : 'universityFacultyContactAddress',
title : '联系人地址',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['universityFacultyContactAddress'])?false:sx_['universityFacultyContactAddress'],
},
{
field : 'universitiesCollegesIdText',
title : '院校名称',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['universitiesCollegesIdText'])?false:sx_['universitiesCollegesIdText'],
},
{
field : 'universityFacultyStatusText', //数据字典类型为 global_status
title : '状态',
// title : '状态( 1 正常 2删除',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['universityFacultyStatusText'])?false:sx_['universityFacultyStatusText'],
},
{
field : 'universityFacultyAddTime',
title : '创建时间',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['universityFacultyAddTime'])?false:sx_['universityFacultyAddTime'],
},
// {
// field : 'userId',
// title : '用户ID',
// align:"center",
// hideField :false,
// hide:$.isEmpty(sx_['userId'])?false:sx_['userId'],
// },
// {
// field : 'orgId',
// title : '组织ID',
// align:"center",
// hideField :false,
// hide:$.isEmpty(sx_['orgId'])?false:sx_['orgId'],
// }
{
field : 'operation_',title : '操作',align:"center", templet: function (d) {
var htm = '<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit">编辑</button>';
htm += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</button>';
return htm;
}
}
]]
] ]
});
});
table.on('checkbox(universityFacultyTable)', function (obj) {
table.on('checkbox(universityFacultyTable)', function(obj){
var universityFaculty = obj.data;
if (obj.checked) {
if(obj.checked){
//按钮逻辑Lib.buttonEnable()
} else {
}else{
}
})
},
initSearchForm: function () {
Lib.initSearchForm($("#searchForm"), universityFacultyTable, form);
initSearchForm:function(){
Lib.initSearchForm( $("#searchForm"),universityFacultyTable,form);
},
initToolBar: function () {
initToolBar:function(){
toolbar = {
add: function () {
var url = "/jlw/universityFaculty/add.do";
Common.openDlg(url, "院系管理管理>新增");
Common.openDlg(url,"院系管理管理>新增");
},
edit: function () {
var data = Common.getOneFromTable(table, "universityFacultyTable");
if (data == null) {
return;
var data = Common.getOneFromTable(table,"universityFacultyTable");
if(data==null){
return ;
}
var url = "/jlw/universityFaculty/add.do?universityFacultyId=" + data.universityFacultyId;
Common.openDlg(url, "院系管理管理>" + data.universityFacultyId + ">编辑");
var url = "/jlw/universityFaculty/add.do?universityFacultyId="+data.universityFacultyId;
Common.openDlg(url,"院系管理管理>"+data.universityFacultyId+">编辑");
},
del: function () {
layui.use(['del'], function () {
layui.use(['del'], function(){
var delView = layui.del
delView.delBatch();
});
@ -150,7 +161,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
},
}
//触发事件
$('.ext-toolbar').on('click', function () {
$('.ext-toolbar').on('click', function() {
var type = $(this).data('type');
toolbar[type] ? toolbar[type].call(this) : '';
});
@ -158,17 +169,17 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
}, initTableTool: table.on('tool(universityFacultyTable)', function (obj) {
var data = obj.data;
if (obj.event === 'edit') {
var url = "/jlw/universityFaculty/add.do?universityFacultyId=" + data.universityFacultyId;
Common.openDlg(url, "院系管理管理>" + data.universityFacultyId + ">编辑");
} else if (obj.event === "del") {
var url = "/jlw/universityFaculty/add.do?universityFacultyId="+data.universityFacultyId;
Common.openDlg(url,"院系管理管理>"+data.universityFacultyId+">编辑");
}else if(obj.event === "del"){
layer.confirm('是否确定删除该信息?', function (index) {
var ret = Common.postAjax("/jlw/universityFaculty/delete.json", {ids: data.universityFacultyId});
layer.msg(ret.code == 0 ? "删除成功!" : ret.msg, {
var ret = Common.postAjax("/jlw/universityFaculty/delete.json",{ids:data.universityFacultyId});
layer.msg(ret.code == 0?"删除成功!":ret.msg, {
offset: ['50%'],
icon: ret.code == 0 ? 1 : 2,
icon: ret.code == 0?1:2,
time: 1500 //2秒关闭如果不配置默认是3秒
}, function () {
if (ret.code == 0) {
},function (){
if(ret.code == 0){
Lib.tableRefresh();
}
});
@ -176,6 +187,6 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
}
})
}
exports('index', view);
exports('index',view);
});

@ -34,5 +34,9 @@ layui.define([ 'form', 'laydate', 'table','universitySystemApi'], function(expor
}
}
//选择院校后查询院系
form.on('select(select_universitiesCollegesIds)', function (obj) {
Lib.getUniversityFacultys($("select[name='universityFacultyId']"),obj.value);
});
exports('add',view);
});

@ -1,136 +1,143 @@
layui.define(['form', 'laydate', 'table'], function (exports) {
layui.define([ 'form', 'laydate', 'table' ], function(exports) {
var form = layui.form;
var laydate = layui.laydate;
var table = layui.table;
var universitySystemTable = null;
var view = {
init: function () {
var view ={
init:function(){
this.initTable();
this.initSearchForm();
this.initToolBar();
window.dataReload = function () {
Lib.doSearchForm($("#searchForm"), universitySystemTable)
window.dataReload = function(){
Lib.doSearchForm($("#searchForm"),universitySystemTable)
}
},
initTable: function () {
var sx_ = localStorage.getItem("universitySystemTable_field_" + Common.userInfoId); //筛选值显示、隐藏缓存
if ($.isEmpty(sx_)) {
sx_ = {};
} else {
sx_ = JSON.parse(sx_);
}
initTable:function(){
var sx_ = localStorage.getItem("universitySystemTable_field_"+Common.userInfoId); //筛选值显示、隐藏缓存
if($.isEmpty(sx_)){sx_ = {};}else {sx_ = JSON.parse(sx_);}
universitySystemTable = table.render({
elem: '#universitySystemTable',
height: Lib.getTableHeight(1),
elem : '#universitySystemTable',
height : Lib.getTableHeight(1),
cellMinWidth: 100,
method: 'post',
url: Common.ctxPath + '/jlw/universitySystem/list.json' // 数据接口
, page: Lib.tablePage // 开启分页
, defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏
, limit: 10,
cols: [[ // 表头
/*{
type: 'checkbox',
},*/
/*{
field: 'universitySystemId',
title: '专业ID',
align: "center",
hideField: false,
hide:$.isEmpty(sx_['universitySystemId'])?false:sx_['universitySystemId'],
width: 60,
},*/
method : 'post',
url : Common.ctxPath + '/jlw/universitySystem/list.json' // 数据接口
,page : Lib.tablePage // 开启分页
,toolbar: '#toolbar_universitySystem' //自定义头部左侧工具栏
,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏
,limit : 10,
cols : [ [ // 表头
{
field: 'universitySystemName',
title: '院系名称',
align: "center",
type : 'checkbox',
},
{
field: 'universitySystemName',
title: '专业名称',
align: "center",
},
{
field: 'universitySystemContact',
title: '联系人',
align: "center",
},
{
field: 'universitySystemContactTel',
title: '联系人电话',
align: "center",
},
{
field: 'universitySystemAddTime',
title: '创建时间',
align: "center",
},
{
field: 'universitySystemStatusText', //数据字典类型为 global_status
// title : '状态 1正常 2删除',
title: '状态',
align: "center",
hide: true,
},
{
field: 'universityFacultyId',
title: '院系ID',
align: "center",
hideField: false,
hide: true,
},
{
field: 'operation_', title: '操作', align: "center", templet: function (d) {
var htm = '<a class="layui-table-link" lay-event="edit">编辑</a>';
htm += '<a class="layui-table-link" lay-event="del">删除</a>';
return htm;
}
{
field : 'universitySystemId',
title : '专业ID',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['universitySystemId'])?false:sx_['universitySystemId'],
width : 60,
},
{
field : 'universitySystemName',
title : '专业名称',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['universitySystemName'])?false:sx_['universitySystemName'],
},
{
field : 'universitySystemContact',
title : '联系人',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['universitySystemContact'])?false:sx_['universitySystemContact'],
},
{
field : 'universitySystemContactTel',
title : '联系人电话',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['universitySystemContactTel'])?false:sx_['universitySystemContactTel'],
},
{
field : 'universitySystemAddTime',
title : '创建时间',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['universitySystemAddTime'])?false:sx_['universitySystemAddTime'],
},
{
field : 'universitySystemStatusText', //数据字典类型为 global_status
// title : '状态 1正常 2删除',
title : '状态',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['universitySystemStatusText'])?false:sx_['universitySystemStatusText'],
},
{
field : 'universityFacultyIdText',
title : '院系',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['universityFacultyIdText'])?false:sx_['universityFacultyIdText'],
},
// {
// field : 'userId',
// title : '用户ID',
// align:"center",
// hideField :false,
// hide:$.isEmpty(sx_['userId'])?false:sx_['userId'],
// },
// {
// field : 'orgId',
// title : '组织ID',
// align:"center",
// hideField :false,
// hide:$.isEmpty(sx_['orgId'])?false:sx_['orgId'],
// }
{
field : 'operation_',title : '操作',align:"center", templet: function (d) {
var htm = '<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit">编辑</button>';
htm += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</button>';
return htm;
}
}
]]
] ]
});
});
table.on('checkbox(universitySystemTable)', function (obj) {
table.on('checkbox(universitySystemTable)', function(obj){
var universitySystem = obj.data;
if (obj.checked) {
if(obj.checked){
//按钮逻辑Lib.buttonEnable()
} else {
}else{
}
})
},
initSearchForm: function () {
Lib.initSearchForm($("#searchForm"), universitySystemTable, form);
initSearchForm:function(){
Lib.initSearchForm( $("#searchForm"),universitySystemTable,form);
},
initToolBar: function () {
initToolBar:function(){
toolbar = {
add: function () {
var url = "/jlw/universitySystem/add.do";
Common.openDlg(url, "专业管理管理>新增");
Common.openDlg(url,"专业管理管理>新增");
},
edit: function () {
var data = Common.getOneFromTable(table, "universitySystemTable");
if (data == null) {
return;
var data = Common.getOneFromTable(table,"universitySystemTable");
if(data==null){
return ;
}
var url = "/jlw/universitySystem/add.do?universitySystemId=" + data.universitySystemId;
Common.openDlg(url, "专业管理管理>" + data.universitySystemId + ">编辑");
var url = "/jlw/universitySystem/add.do?universitySystemId="+data.universitySystemId;
Common.openDlg(url,"专业管理管理>"+data.universitySystemId+">编辑");
},
del: function () {
layui.use(['del'], function () {
layui.use(['del'], function(){
var delView = layui.del
delView.delBatch();
});
@ -146,7 +153,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
},
}
//触发事件
$('.ext-toolbar').on('click', function () {
$('.ext-toolbar').on('click', function() {
var type = $(this).data('type');
toolbar[type] ? toolbar[type].call(this) : '';
});
@ -154,17 +161,17 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
}, initTableTool: table.on('tool(universitySystemTable)', function (obj) {
var data = obj.data;
if (obj.event === 'edit') {
var url = "/jlw/universitySystem/add.do?universitySystemId=" + data.universitySystemId;
Common.openDlg(url, "专业管理管理>" + data.universitySystemId + ">编辑");
} else if (obj.event === "del") {
var url = "/jlw/universitySystem/add.do?universitySystemId="+data.universitySystemId;
Common.openDlg(url,"专业管理管理>"+data.universitySystemId+">编辑");
}else if(obj.event === "del"){
layer.confirm('是否确定删除该信息?', function (index) {
var ret = Common.postAjax("/jlw/universitySystem/delete.json", {ids: data.universitySystemId});
layer.msg(ret.code == 0 ? "删除成功!" : ret.msg, {
var ret = Common.postAjax("/jlw/universitySystem/delete.json",{ids:data.universitySystemId});
layer.msg(ret.code == 0?"删除成功!":ret.msg, {
offset: ['50%'],
icon: ret.code == 0 ? 1 : 2,
icon: ret.code == 0?1:2,
time: 1500 //2秒关闭如果不配置默认是3秒
}, function () {
if (ret.code == 0) {
},function (){
if(ret.code == 0){
Lib.tableRefresh();
}
});
@ -172,6 +179,6 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
}
})
}
exports('index', view);
exports('index',view);
});

@ -2,7 +2,7 @@
<link rel="stylesheet" type="text/css" href="${ctxPath}/css/plugin.css?v=${jsVer}" media="all"/>
<form class="layui-form" id="addForm">
<div style="margin-left: 95px;">
<layui:submitButtons id="addButton" buttonType=""/>
<layui:submitButtons id="addButton" buttonType="" />
</div>
<!--beTeacher :1是院校老师 2不是-->
<!--#if(beTeacher == 2){ -->
@ -11,10 +11,8 @@
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>所属院校:</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${schoolClass.universitiesCollegesId}"
type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
id="universitiesCollegesId" name="universitiesCollegesId"
layFilter="select_universitiesColleges"/>
<layui:simpleDictSelect style='layui-input-inline' value="${schoolClass.universitiesCollegesId}" type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
id="universitiesCollegesId" name="universitiesCollegesId" layFilter="select_universitiesColleges"/>
</div>
</div>
</div>
@ -22,43 +20,43 @@
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>专业</label>
<label class="layui-form-label"><span class="req">*</span>所属院系</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${schoolClass.universitySystemId}"
type="university_system.university_system_name.university_system_status=1,university_faculty_id=${schoolClass.universitiesCollegesId}"
id="universitySystemId" name="universitySystemId"/>
<layui:simpleDictSelect style='layui-input-inline' value="${universityFacultyId}" type="university_faculty.university_faculty_name.university_faculty_status=1,universities_colleges_id=${schoolClass.universitiesCollegesId}"
id="universityFacultyId" name="universityFacultyId" layFilter="select_universityFacultyIds"/>
</div>
</div>
<button type="button" class="layui-btn layui-btn-sm rightUniversitySystemAdd bg_button">去添加</button>
</div>
</div>
<!--#} -->
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>班级名称</label>
<label class="layui-form-label"><span class="req">*</span>专业</label>
<div class="layui-input-inline">
<input type="text" name="className" value="${schoolClass.className}" class="layui-input">
<layui:simpleDictSelect style='layui-input-inline' value="${schoolClass.universitySystemId}" type="university_system.university_system_name.university_system_status=1,university_faculty_id=${universityFacultyId}"
id="universitySystemId" name="universitySystemId"/>
</div>
</div>
<button type="button" class="layui-btn layui-btn-sm rightUniversitySystemAdd bg_button">去添加</button>
</div>
</div>
<!--#} -->
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>班级编号</label>
<div class="layui-input-inline">
<input type="text" name="classSn" value="${schoolClass.classSn}" class="layui-input">
</div>
<label class="layui-form-label"><span class="req">*</span>班级名称</label>
<div class="layui-input-inline">
<input type="text" name="className" value="${schoolClass.className}" class="layui-input" >
</div>
</div>
</div>
</div>
<input type="hidden" name="classId" value="${schoolClass.classId}"/>
<input type="hidden" name="classId" value="${schoolClass.classId}" />
</form>
<!--#} -->
<script>
layui.use(['add'], function () {
var schoolClassAdd = layui.add
schoolClassAdd.init();
});
layui.use(['add'], function(){
var schoolClassAdd = layui.add
schoolClassAdd.init();
});
</script>

@ -18,12 +18,23 @@
<button type="button" class="layui-btn layui-btn-sm rightOffAdd bg_button">去添加</button>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>所属院系:</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${universityFacultyId}" type="university_faculty.university_faculty_name.university_faculty_status=1,universities_colleges_id=${universitiesCollegesId}"
id="universityFacultyId" name="universityFacultyId" layFilter="select_universityFacultyIds"/>
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>专业:</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${universitySystemId}" type="university_system.university_system_name.university_system_status=1,university_faculty_id=${universitiesCollegesId}"
<layui:simpleDictSelect style='layui-input-inline' value="${universitySystemId}" type="university_system.university_system_name.university_system_status=1,university_faculty_id=${universityFacultyId}"
id="universitySystemId" name="universitySystemId" layFilter="select_universitySystemId" />
</div>
</div>

@ -1,62 +1,53 @@
<!--# layout("/common/layout.html",{"jsBase":"/js/jlw/universityFaculty/"}){ -->
<link rel="stylesheet" type="text/css" href="${ctxPath}/css/plugin.css?v=${jsVer}" media="all"/>
<form class="layui-form" id="addForm">
<div style="margin-left: 95px;">
<layui:submitButtons id="addButton" buttonType="" showExamine="2"/>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">院校名称</label>
<div class="layui-input-inline">
<input type="text" id="id1" name="id1" value="${universityFaculty.id1}" class="layui-input">
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">院校名称</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${universityFaculty.universitiesCollegesId}" type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
id="universitiesCollegesId" name="universitiesCollegesId" layFilter="universitiesCollegesId"/>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">院系名称</label>
<div class="layui-input-inline">
<input type="text" id="universityFacultyName" name="universityFacultyName"
value="${universityFaculty.universityFacultyName}" class="layui-input">
<div class="layui-inline">
<label class="layui-form-label">院系名称</label>
<div class="layui-input-inline">
<input type="text" id="universityFacultyName" name="universityFacultyName" value="${universityFaculty.universityFacultyName}" class="layui-input" >
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">联系人</label>
<div class="layui-input-inline">
<input type="text" id="universityFacultyContact" name="universityFacultyContact"
value="${universityFaculty.universityFacultyContact}" class="layui-input">
<div class="layui-inline">
<label class="layui-form-label">联系人</label>
<div class="layui-input-inline">
<input type="text" id="universityFacultyContact" name="universityFacultyContact" value="${universityFaculty.universityFacultyContact}" class="layui-input" >
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">联系人电话</label>
<div class="layui-input-inline">
<input type="text" id="universityFacultyContactTel" name="universityFacultyContactTel"
value="${universityFaculty.universityFacultyContactTel}" class="layui-input">
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">联系人电话</label>
<div class="layui-input-inline">
<input type="text" id="universityFacultyContactTel" name="universityFacultyContactTel" value="${universityFaculty.universityFacultyContactTel}" class="layui-input" >
</div>
</div>
</div>
</div>
<div class="layui-form-item layui-form-text">
<div class="layui-inline">
<label class="layui-form-label">联系人地址</label>
<div class="layui-input-inline">
<textarea name="desc" placeholder="请输入内容" id="universityFacultyContactAddress"
name="universityFacultyContactAddress"
value="${universityFaculty.universityFacultyContactAddress}"
class="layui-textarea"></textarea>
<div class="layui-inline">
<label class="layui-form-label">联系人地址</label>
<div class="layui-input-inline">
<input type="text" id="universityFacultyContactAddress" name="universityFacultyContactAddress" value="${universityFaculty.universityFacultyContactAddress}" class="layui-input" >
</div>
</div>
</div>
</div>
<!-- 业务对象须有hidden字段保存delFlag和version字段-->
<input type="hidden" name="universityFacultyId" value="${universityFaculty.universityFacultyId}"/>
<!-- 业务对象须有hidden字段保存delFlag和version字段-->
<input type="hidden" name="universityFacultyId" value="${universityFaculty.universityFacultyId}" />
<layui:submitButtons id="addButton" buttonType="" showExamine="2" />
</form>
<!--#} -->
<script>
layui.use(['add'], function () {
var universityFacultyAdd = layui.add
universityFacultyAdd.init();
});
layui.use(['add'], function(){
var universityFacultyAdd = layui.add
universityFacultyAdd.init();
});
</script>

@ -1,65 +1,54 @@
<!--# layout("/common/layout.html",{"jsBase":"/js/jlw/universitySystem/"}){ -->
<link rel="stylesheet" type="text/css" href="${ctxPath}/css/plugin.css?v=${jsVer}" media="all"/>
<form class="layui-form" id="addForm">
<div style="margin-left: 95px;">
<layui:submitButtons id="addButton" buttonType="" showExamine="2"/>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">院校名称</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${universitySystem.universitiesCollegesId}"
type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
id="universitiesCollegesId" name="universitiesCollegesId"
layFilter="select_universitiesCollegesIds"/>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">院校名称</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${universitiesCollegesId}" type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
id="universitiesCollegesId" name="universitiesCollegesId" layFilter="select_universitiesCollegesIds"/>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">所属学院</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${universitySystem.universityFacultyId}"
type="university_faculty.university_faculty_name.university_faculty_status=1"
id="universityFacultyId" name="universityFacultyId"
layFilter="select_universityFacultyIds"/>
<div class="layui-inline">
<label class="layui-form-label">所属学院</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${universitySystem.universityFacultyId}" type="university_faculty.university_faculty_name.university_faculty_status=1,universities_colleges_id=${universitiesCollegesId}"
id="universityFacultyId" name="universityFacultyId" layFilter="select_universityFacultyIds"/>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">专业名称</label>
<div class="layui-input-inline">
<input type="text" id="universitySystemName" name="universitySystemName"
value="${universitySystem.universitySystemName}" class="layui-input">
<div class="layui-inline">
<label class="layui-form-label">专业名称</label>
<div class="layui-input-inline">
<input type="text" id="universitySystemName" name="universitySystemName" value="${universitySystem.universitySystemName}" class="layui-input" >
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">联系人</label>
<div class="layui-input-inline">
<input type="text" id="universitySystemContact" name="universitySystemContact"
value="${universitySystem.universitySystemContact}" class="layui-input">
<div class="layui-inline">
<label class="layui-form-label">联系人</label>
<div class="layui-input-inline">
<input type="text" id="universitySystemContact" name="universitySystemContact" value="${universitySystem.universitySystemContact}" class="layui-input" >
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">联系人电话</label>
<div class="layui-input-inline">
<input type="text" id="universitySystemContactTel" name="universitySystemContactTel"
value="${universitySystem.universitySystemContactTel}" class="layui-input">
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">联系人电话</label>
<div class="layui-input-inline">
<input type="text" id="universitySystemContactTel" name="universitySystemContactTel" value="${universitySystem.universitySystemContactTel}" class="layui-input" >
</div>
</div>
</div>
</div>
<!-- 业务对象须有hidden字段保存delFlag和version字段-->
<input type="hidden" name="universitySystemId" value="${universitySystem.universitySystemId}"/>
<!-- 业务对象须有hidden字段保存delFlag和version字段-->
<input type="hidden" name="universitySystemId" value="${universitySystem.universitySystemId}" />
<layui:submitButtons id="addButton" buttonType="" showExamine="2" />
</form>
<!--#} -->
<script>
layui.use(['add'], function () {
var universitySystemAdd = layui.add
universitySystemAdd.init();
});
layui.use(['add'], function(){
var universitySystemAdd = layui.add
universitySystemAdd.init();
});
</script>

Loading…
Cancel
Save