tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

Browse Source
beetlsql3-dev
姚丹ab 2 years ago
parent 09240bf5f1
commit 551ddc669a
7 changed files with 392 additions and 338 deletions
Show Stats Download Patch File Download Diff File

8
web/src/main/java/com/ibeetl/jlw/web/query/UniversitySystemQuery.java
Unescape Escape View File

@ -17,16 +17,16 @@ public class UniversitySystemQuery extends PageParam {
@NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
@Query(name = "专业ID", display = false) @Query(name = "专业ID", display = false)
private Long universitySystemId; private Long universitySystemId;
@Query(name = "专业名称", display = true) @Query(name = "专业名称", display = false)
private String universitySystemName; private String universitySystemName;
@Query(name = "联系人", display = true) @Query(name = "联系人", display = false)
private String universitySystemContact; private String universitySystemContact;
@Query(name = "联系人电话", display = true) @Query(name = "联系人电话", display = false)
private String universitySystemContactTel; private String universitySystemContactTel;
@Query(name = "创建时间", display = false) @Query(name = "创建时间", display = false)
private Date universitySystemAddTime; private Date universitySystemAddTime;
// @Query(name = "状态 （1正常 2删除）", display = true,type=Query.TYPE_DICT,dict="global_status") // @Query(name = "状态 （1正常 2删除）", display = true,type=Query.TYPE_DICT,dict="global_status")
@Query(name = "状态", display = true,type=Query.TYPE_DICT,dict=GLOBAL_STATUS) @Query(name = "状态", display = false,type=Query.TYPE_DICT,dict=GLOBAL_STATUS)
private Integer universitySystemStatus; private Integer universitySystemStatus;
// @Query(name = "院系ID（学院ID）", display = false) // @Query(name = "院系ID（学院ID）", display = false)
@Query(name = "院系ID", display = false) @Query(name = "院系ID", display = false)

250
web/src/main/resources/static/js/jlw/universityFaculty/index.js
Unescape Escape View File

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

234
web/src/main/resources/static/js/jlw/universitySystem/index.js
Unescape Escape View File

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

88
web/src/main/resources/templates/jlw/universityFaculty/add.html
Unescape Escape View File

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

16
web/src/main/resources/templates/jlw/universityFaculty/index.html
Unescape Escape View File

@ -15,25 +15,25 @@
<table id="universityFacultyTable" lay-filter="universityFacultyTable"></table> <table id="universityFacultyTable" lay-filter="universityFacultyTable"></table>
<!--#} --> <!--#} -->
<script type="text/html" id="toolbar_universityFaculty"> <!--<script type="text/html" id="toolbar_universityFaculty">
<div class="layui-btn-container"> <div class="layui-btn-container">
<div class="layui-btn-group"> <div class="layui-btn-group">
<!--# if(core.searchIsShow(search)) {--> &lt;!&ndash;# if(core.searchIsShow(search)) {&ndash;&gt;
<layui:accessButton function="universityFaculty.query" id="searchFormSearch" action="search"><i <layui:accessButton function="universityFaculty.query" id="searchFormSearch" action="search"><i
class="layui-icon">&#xe615;</i>搜索 class="layui-icon">&#xe615;</i>搜索
</layui:accessButton> </layui:accessButton>
<!--# }--> &lt;!&ndash;# }&ndash;&gt;
<layui:accessButton function="universityFaculty.add" action="add"><i class="layui-icon">&#xe61f;</i>新增 <layui:accessButton function="universityFaculty.add" action="add"><i class="layui-icon">&#xe61f;</i>新增
</layui:accessButton> </layui:accessButton>
<!--<layui:accessButton function="universityFaculty.edit" action="edit">修改</layui:accessButton> &lt;!&ndash;<layui:accessButton function="universityFaculty.edit" action="edit">修改</layui:accessButton>
<layui:accessButton function="universityFaculty.del" action="del">删除</layui:accessButton>--> <layui:accessButton function="universityFaculty.del" action="del">删除</layui:accessButton>&ndash;&gt;
<!--# if(!isEmpty(search)) {--> &lt;!&ndash;# if(!isEmpty(search)) {&ndash;&gt;
<layui:accessButton function="universityFaculty.query" action="refresh"><i class="layui-icon">&#xe669;</i>刷新 <layui:accessButton function="universityFaculty.query" action="refresh"><i class="layui-icon">&#xe669;</i>刷新
</layui:accessButton> </layui:accessButton>
<!--# }--> &lt;!&ndash;# }&ndash;&gt;
</div> </div>
</div> </div>
</script> </script>-->
<script> <script>
layui.use(['index'], function () { layui.use(['index'], function () {

90
web/src/main/resources/templates/jlw/universitySystem/add.html
Unescape Escape View File

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

44
web/src/main/resources/templates/jlw/universitySystem/index.html
Unescape Escape View File

@ -5,38 +5,60 @@
} }
</style> </style>
<layui:searchForm formId="searchForm" searchList="" condition="${search}"> <layui:searchForm formId="searchForm" searchList="" condition="${search}">
<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" placeholder=""
autocomplete="off" class="layui-input">
</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'
type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
id="universitiesCollegesId" name="universitiesCollegesId"
layFilter="select_universitiesColleges"/>
</div>
</div>
</div>
</layui:searchForm> </layui:searchForm>
<div class="layui-btn-group"> <div class="layui-btn-group">
<div class="layui-btn-group" > <div class="layui-btn-group">
<layui:accessButton function="universitySystem.add" action="add"><i class="layui-icon">&#xe61f;</i>添加</layui:accessButton> <layui:accessButton function="universitySystem.add" action="add"><i class="layui-icon">&#xe61f;</i>添加
</layui:accessButton>
<!--<layui:accessButton function="universitySystem.edit" action="edit">修改</layui:accessButton> <!--<layui:accessButton function="universitySystem.edit" action="edit">修改</layui:accessButton>
<layui:accessButton function="universitySystem.del" action="del">删除</layui:accessButton>--> <layui:accessButton function="universitySystem.del" action="del">删除</layui:accessButton>-->
<layui:accessButton function="universitySystem.query" action="refresh"><i class="layui-icon">&#xe669;</i>刷新</layui:accessButton> <layui:accessButton function="universitySystem.query" action="refresh"><i class="layui-icon">&#xe669;</i>刷新
</layui:accessButton>
</div> </div>
</div> </div>
<table id="universitySystemTable" lay-filter="universitySystemTable"></table> <table id="universitySystemTable" lay-filter="universitySystemTable"></table>
<!--#} --> <!--#} -->
<script type="text/html" id="toolbar_universitySystem"> <!--<script type="text/html" id="toolbar_universitySystem">
<div class="layui-btn-container"> <div class="layui-btn-container">
<div class="layui-btn-group" > <div class="layui-btn-group" >
<layui:accessButton function="universitySystem.add" action="add"><i class="layui-icon">&#xe61f;</i>添加</layui:accessButton> <layui:accessButton function="universitySystem.add" action="add"><i class="layui-icon">&#xe61f;</i>添加</layui:accessButton>
<!--<layui:accessButton function="universitySystem.edit" action="edit">修改</layui:accessButton> &lt;!&ndash;<layui:accessButton function="universitySystem.edit" action="edit">修改</layui:accessButton>
<layui:accessButton function="universitySystem.del" action="del">删除</layui:accessButton>--> <layui:accessButton function="universitySystem.del" action="del">删除</layui:accessButton>&ndash;&gt;
<layui:accessButton function="universitySystem.query" action="refresh"><i class="layui-icon">&#xe669;</i>刷新</layui:accessButton> <layui:accessButton function="universitySystem.query" action="refresh"><i class="layui-icon">&#xe669;</i>刷新</layui:accessButton>
</div> </div>
</div> </div>
</script> </script>-->
<script> <script>
layui.use(['index'], function(){ layui.use(['index'], function () {
var index = layui.index; var index = layui.index;
index.init(); index.init();
}); });
</script> </script>

Write Preview
Loading…
Cancel
Save