gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
wangxin
2018-03-07 16:41:17 +08:00
parent 38d5b20efd c48bdc9afe
commit e4edb7bd18
11 changed files with 94 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
View File

@@ -95,7 +95,7 @@ public class RequestInfoController extends BaseController{
} }
/** /**
* 审核 * 审核通过
* @param requestInfo * @param requestInfo
* @param model * @param model
* @return * @return
@@ -106,6 +106,19 @@ public class RequestInfoController extends BaseController{
addMessage(redirectAttributes, "success"); addMessage(redirectAttributes, "success");
return "redirect:" + adminPath + "/cfg/request/list?repage"; return "redirect:" + adminPath + "/cfg/request/list?repage";
}
/**
* 审核未通过
* @param requestInfo
* @param model
* @return
*/
@RequestMapping(value = "requestExamineNo")
public String requestExamineNo(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
requestInfoService.requestExamineNo(requestInfo);
addMessage(redirectAttributes, "success");
return "redirect:" + adminPath + "/cfg/request/list?repage";
} }
/** /**
* 取消审核 * 取消审核

5
src/main/java/com/nis/web/service/configuration/RequestInfoService.java
View File

@@ -67,6 +67,11 @@ public class RequestInfoService extends BaseService{
requestInfoDao.update(requestInfo); requestInfoDao.update(requestInfo);
} }
@Transactional(readOnly=false,rollbackFor=DataAccessException.class) @Transactional(readOnly=false,rollbackFor=DataAccessException.class)
public void requestExamineNo(RequestInfo requestInfo){
requestInfo.setIsAudit(2);//审核未通过
requestInfoDao.update(requestInfo);
}
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
public void requestCancelExamine(RequestInfo requestInfo){ public void requestCancelExamine(RequestInfo requestInfo){
requestInfo.setIsAudit(3);//取消审核通过 requestInfo.setIsAudit(3);//取消审核通过
int update = requestInfoDao.update(requestInfo); int update = requestInfoDao.update(requestInfo);

10
src/main/resources/messages/message_en.properties
View File

@@ -97,14 +97,14 @@ service_dict_id=servicedictid
item_type=itemtype item_type=itemtype
item_code=itemcode item_code=itemcode
item_value=itemvalue item_value=itemvalue
desc=desc desc=description
parent_id=parentid parent_id=parentid
is_leaf=isleaf is_leaf=whether subnode
is_valid=isvalid is_valid=whether valid
creator_id=creatorid
create_time=createtime create_time=createtime
editor_id=editorid
edit_time=edittime edit_time=edittime
superior_config=superior configuration
config_content=configuration content
#============yewu end====================== #============yewu end======================

11
src/main/resources/messages/message_zh_CN.properties
View File

@@ -95,16 +95,17 @@ system_service_manage=\u7cfb\u7edf\u4e1a\u52a1\u7c7b\u578b\u7ba1\u7406
#==========yewu zidian begin===================== #==========yewu zidian begin=====================
service_dict_id=\u5b57\u5178ID service_dict_id=\u5b57\u5178ID
item_type=\u6570\u636e\u7c7b\u578b item_type=\u6570\u636e\u7c7b\u578b
item_code=\u7f16\u7801 item_code=\u914d\u7f6e\u7f16\u7801
item_value=\u7f16\u7801\u5bf9\u5e94\u503c item_value=\u7f16\u7801\u5bf9\u5e94\u503c
desc=\u63cf\u8ff0\u4fe1\u606f desc=\u63cf\u8ff0\u4fe1\u606f
parent_id=\u7236ID parent_id=\u7236ID
is_leaf=\u662f\u5426\u53f6\u5b50\u8282\u70b9 is_leaf=\u662f\u5426\u53f6\u5b50\u8282\u70b9
is_valid=\u6709\u6548\u6807\u5fd7 is_valid=\u6709\u6548\u6807\u5fd7
creator_id=\u521b\u5efa\u4eba\u5458
create_time=\u914d\u7f6e\u65f6\u95f4 create_time=\u914d\u7f6e\u65f6\u95f4
editor_id=\u4fee\u6539\u4eba\u5458
edit_time=\u4fee\u6539\u65f6\u95f4 edit_time=\u4fee\u6539\u65f6\u95f4
superior_config=\u4e0a\u7ea7\u914d\u7f6e
config_content=\u914d\u7f6e\u5185\u5bb9
#==========yewu zidian end===================== #==========yewu zidian end=====================
#==========laihan begin===================== #==========laihan begin=====================
@@ -115,7 +116,7 @@ state=\u72b6\u6001
created=\u672a\u5ba1\u6838 created=\u672a\u5ba1\u6838
examine=\u5ba1\u6838 examine=\u5ba1\u6838
unapproved=\u672a\u901a\u8fc7 unapproved=\u672a\u901a\u8fc7
approved=\u5df2\u901a\u8fc7 approved=\u901a\u8fc7
title=\u6807\u9898 title=\u6807\u9898
request_time=\u6765\u51fd\u65f6\u95f4 request_time=\u6765\u51fd\u65f6\u95f4
operate_time=\u64cd\u4f5c\u65f6\u95f4 operate_time=\u64cd\u4f5c\u65f6\u95f4
@@ -131,7 +132,7 @@ begin_date=\u5f00\u59cb\u65f6\u95f4
end_date=\u7ed3\u675f\u65f6\u95f4 end_date=\u7ed3\u675f\u65f6\u95f4
delete=\u5220\u9664 delete=\u5220\u9664
special_task=\u4e13\u9879\u4efb\u52a1 special_task=\u4e13\u9879\u4efb\u52a1
#==========yewu zidian end===================== #==========laihan end=====================
#==========message begin===================== #==========message begin=====================
required=\u4e0d\u80fd\u4e3a\u7a7a! required=\u4e0d\u80fd\u4e3a\u7a7a!

20
src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp
View File

@@ -141,13 +141,13 @@
<div class="theme-panel hidden-xs hidden-sm"> <div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="history.go(-1)">返回</button> <button type="button" class="btn btn-default" onclick="history.go(-1)"><spring:message code="back"/></button>
</div> </div>
<h3 class="page-title"> <h3 class="page-title">
配置管理 <spring:message code="configuration_manage"/>
</h3> </h3>
<div class="row"> <div class="row">
@@ -155,7 +155,7 @@
<div class="portlet box blue"> <div class="portlet box blue">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption"> <div class="caption">
<i class="fa fa-gift"></i>配置<shiro:hasPermission name="sys:menu:edit">${not empty serviceDictInfo.serviceDictId?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit">查看</shiro:lacksPermission></div> <i class="fa fa-gift"></i><shiro:hasPermission name="sys:menu:edit">${not empty serviceDictInfo.serviceDictId?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit"><spring:message code="show"/></shiro:lacksPermission></div>
<div class="tools"> <div class="tools">
<!-- <a href="javascript:;" class="collapse"> </a> <!-- <a href="javascript:;" class="collapse"> </a>
<a href="#portlet-config" data-toggle="modal" class="config"> </a> <a href="#portlet-config" data-toggle="modal" class="config"> </a>
@@ -174,14 +174,14 @@
<form:hidden path="serviceDictId"/> <form:hidden path="serviceDictId"/>
<sys:message content="${message}"/> <sys:message content="${message}"/>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">上级配置:</label> <label class="col-md-3 control-label"><spring:message code="superior_config"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<sys:treeselect id="serviceDictInfo" name="parent.serviceDictId" value="${serviceDictInfo.parent.serviceDictId}" labelName="parent.itemValue" labelValue="${serviceDictInfo.parent.itemValue eq '根节点'?'根节点':fns:getServiceDictInfoById(serviceDictInfo.parent.serviceDictId).itemValue}" <sys:treeselect id="serviceDictInfo" name="parent.serviceDictId" value="${serviceDictInfo.parent.serviceDictId}" labelName="parent.itemValue" labelValue="${serviceDictInfo.parent.itemValue eq '根节点'?'根节点':fns:getServiceDictInfoById(serviceDictInfo.parent.serviceDictId).itemValue}"
title="菜单" url="/basics/serviceDictInfo/treeData?itType=${itType}" extId="${serviceDictInfo.serviceDictId}" cssClass="required form-control"/> title="菜单" url="/basics/serviceDictInfo/treeData?itType=${itType}" extId="${serviceDictInfo.serviceDictId}" cssClass="required form-control"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label radio-lable"><font color="red">*</font> 数据类型:</label> <label class="col-md-3 control-label radio-lable"><font color="red">*</font> <spring:message code="item_type"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<select id="itemType" name="itemType" class="form-control"> <select id="itemType" name="itemType" class="form-control">
<c:forEach items="${fns:getDictList('SERVICE_DICT_ITM_TYPE')}" var="dict"> <c:forEach items="${fns:getDictList('SERVICE_DICT_ITM_TYPE')}" var="dict">
@@ -203,13 +203,13 @@
</div> </div>
</div> --%> </div> --%>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>配置内容:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code="config_content"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<form:input path="itemValue" htmlEscape="false" maxlength="2000" class="form-control"/> <form:input path="itemValue" htmlEscape="false" maxlength="2000" class="form-control"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>是否为叶子节点:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<%-- <form:radiobuttons path="isLeaf" items="${fns:getDictOption('SYS_YES_NO')}" /> --%> <%-- <form:radiobuttons path="isLeaf" items="${fns:getDictOption('SYS_YES_NO')}" /> --%>
<form:select path="isLeaf" class="form-control"> <form:select path="isLeaf" class="form-control">
@@ -218,7 +218,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">描述信息:</label> <label class="col-md-3 control-label"><spring:message code="desc"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<form:textarea path="itemDesc" htmlEscape="false" maxlength="2000" class="form-control"/> <form:textarea path="itemDesc" htmlEscape="false" maxlength="2000" class="form-control"/>
</div> </div>
@@ -226,8 +226,8 @@
<div class="form-actions"> <div class="form-actions">
<div class="row"> <div class="row">
<div class="col-md-offset-3 col-md-9"> <div class="col-md-offset-3 col-md-9">
<shiro:hasPermission name="sys:menu:edit"><button type="submit" class="btn btn-circle blue">保存</button></shiro:hasPermission> <shiro:hasPermission name="sys:menu:edit"><button type="submit" class="btn btn-circle blue"><spring:message code="submit"/></button></shiro:hasPermission>
<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)">Cancel</button> <button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"/></button>
</div> </div>
</div> </div>
</div> </div>

18
src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp
View File

@@ -12,13 +12,13 @@
<div class="theme-panel hidden-xs hidden-sm"> <div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="history.go(-1)">返回</button> <button type="button" class="btn btn-default" onclick="history.go(-1)"><spring:message code="back"/></button>
</div> </div>
<h3 class="page-title"> <h3 class="page-title">
配置管理 <spring:message code="configuration_manage"/>
</h3> </h3>
<div class="row"> <div class="row">
@@ -26,7 +26,7 @@
<div class="portlet box blue"> <div class="portlet box blue">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption"> <div class="caption">
<i class="fa fa-gift"></i>配置查看</div> <i class="fa fa-gift"></i><spring:message code="show"/></div>
</div> </div>
<div class="portlet-body form"> <div class="portlet-body form">
@@ -39,37 +39,37 @@
<form:hidden path="serviceDictId"/> <form:hidden path="serviceDictId"/>
<sys:message content="${message}"/> <sys:message content="${message}"/>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">上级配置:</label> <label class="col-md-3 control-label"><spring:message code="superior_config"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<input value="${serviceDictInfo.parent.serviceDictId == 0?'根节点':fns:getServiceDictInfoById(serviceDictInfo.parent.serviceDictId).itemValue}" maxlength="50" class="form-control" readonly="readonly"/> <input value="${serviceDictInfo.parent.serviceDictId == 0?'根节点':fns:getServiceDictInfoById(serviceDictInfo.parent.serviceDictId).itemValue}" maxlength="50" class="form-control" readonly="readonly"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label radio-lable"><font color="red">*</font> 数据类型:</label> <label class="col-md-3 control-label radio-lable"><font color="red">*</font> <spring:message code="item_type"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<input value="${fns:getDictLabel('SERVICE_DICT_ITM_TYPE',serviceDictInfo.itemType,'0')}" maxlength="50" class="form-control" readonly="readonly"/> <input value="${fns:getDictLabel('SERVICE_DICT_ITM_TYPE',serviceDictInfo.itemType,'0')}" maxlength="50" class="form-control" readonly="readonly"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>编码:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code="item_code"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<input value="${serviceDictInfo.itemCode}" maxlength="50" class="form-control" readonly="readonly"/> <input value="${serviceDictInfo.itemCode}" maxlength="50" class="form-control" readonly="readonly"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>编码对应值:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code="item_value"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<input value="${serviceDictInfo.itemValue}" maxlength="50" class="form-control" readonly="readonly"/> <input value="${serviceDictInfo.itemValue}" maxlength="50" class="form-control" readonly="readonly"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>是否叶子节点:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<input value="${fns:getDictLabel('SYS_YES_NO',serviceDictInfo.isValid,'0')}" maxlength="50" class="form-control" readonly="readonly"/> <input value="${fns:getDictLabel('SYS_YES_NO',serviceDictInfo.isValid,'0')}" maxlength="50" class="form-control" readonly="readonly"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">描述信息:</label> <label class="col-md-3 control-label"><spring:message code="desc"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<form:textarea path="itemDesc" htmlEscape="false" maxlength="2000" class="form-control"/> <form:textarea path="itemDesc" htmlEscape="false" maxlength="2000" class="form-control"/>
</div> </div>

24
src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
View File

@@ -39,11 +39,11 @@
<div class="theme-panel hidden-xs hidden-sm"> <div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="location='${ctx}/basics/serviceDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button> <button type="button" class="btn btn-default" onclick="location='${ctx}/basics/serviceDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>
<button type="button" class="btn btn-primary" <button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/basics/serviceDictInfo/form?itType=${itType}'">新增配置</button> onClick="javascript:window.location='${ctx}/basics/serviceDictInfo/form?itType=${itType}'"><spring:message code="add"/></button>
</div> </div>
<h3 class="page-title"> <h3 class="page-title">
配置管理 <spring:message code="configuration_manage"/>
</h3> </h3>
<div class="row"> <div class="row">
@@ -51,7 +51,7 @@
<div class="portlet box blue"> <div class="portlet box blue">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption"> <div class="caption">
<i class="fa fa-cogs"></i>列表信息 <i class="fa fa-cogs"></i><spring:message code="date_list"/>
</div> </div>
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
@@ -62,11 +62,11 @@
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/> <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/> <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<div class="col-md-12"> <div class="col-md-12">
<label class="search-lable">配置内容:</label><input id="itemValue" name="itemValue" type="text" maxlength="25" class="input-medium" value="${serviceDictInfo.itemValue}"/> <label class="search-lable"><spring:message code="config_content"/>:</label><input id="itemValue" name="itemValue" type="text" maxlength="25" class="input-medium" value="${serviceDictInfo.itemValue}"/>
<label class="search-lable">配置编码:</label><input id="itemCode" name="itemCode" type="text" maxlength="25" class="input-medium" value="${serviceDictInfo.itemCode}"/> <label class="search-lable"><spring:message code="item_code"/>:</label><input id="itemCode" name="itemCode" type="text" maxlength="25" class="input-medium" value="${serviceDictInfo.itemCode}"/>
<label class="search-lable itemType">数据类型:</label> <label class="search-lable itemType"><spring:message code="item_type"/>:</label>
<select id="itemType" name="itemType" > <select id="itemType" name="itemType" >
<option value="" selected="selected">-请选择-</option> <option value="" selected="selected"><spring:message code="select"/></option>
<c:forEach items="${fns:getDictList('SERVICE_DICT_ITM_TYPE')}" var="dict"> <c:forEach items="${fns:getDictList('SERVICE_DICT_ITM_TYPE')}" var="dict">
<c:forEach items="${intArr}" var="itTemp"> <c:forEach items="${intArr}" var="itTemp">
<c:if test="${dict.itemCode eq itTemp}"> <c:if test="${dict.itemCode eq itTemp}">
@@ -88,7 +88,7 @@
</div> </div>
</form:form> </form:form>
<table id="treeTable" class="table table-striped table-bordered table-condensed"> <table id="treeTable" class="table table-striped table-bordered table-condensed">
<thead><tr><th>配置内容</th><th>配置编码</th><th>描述信息</th><th>数据类型</th><th>叶子节点</th><th>创建人员</th><th>创建时间</th><th>最近修改人员</th><th>最近修改时间</th><shiro:hasPermission name="sys:menu:edit"><th>操作</th></shiro:hasPermission></tr></thead> <thead><tr><th><spring:message code="config_content"/></th><th><spring:message code="item_code"/></th><th><spring:message code="desc"/></th><th><spring:message code="item_type"/></th><th><spring:message code="is_leaf"/></th><th><spring:message code="creator"/></th><th><spring:message code="create_time"/></th><th><spring:message code="editor"/></th><th><spring:message code="edit_time"/></th><shiro:hasPermission name="sys:menu:edit"><th><spring:message code="operation"/></th></shiro:hasPermission></tr></thead>
<tbody><c:forEach items="${list}" var="serviceDictInfo"> <tbody><c:forEach items="${list}" var="serviceDictInfo">
<tr id="${serviceDictInfo.serviceDictId}" pId="${serviceDictInfo.parent.serviceDictId ne 0?serviceDictInfo.parent.serviceDictId:0}"> <tr id="${serviceDictInfo.serviceDictId}" pId="${serviceDictInfo.parent.serviceDictId ne 0?serviceDictInfo.parent.serviceDictId:0}">
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemValue}</a></td> <td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemValue}</a></td>
@@ -106,14 +106,14 @@
<td><fmt:formatDate value="${serviceDictInfo.editTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td> <td><fmt:formatDate value="${serviceDictInfo.editTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<td> <td>
<div class="btn-group btn-xs"> <div class="btn-group btn-xs">
<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a> <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"/><span class="caret"></span></a>
<ul class="dropdown-menu btn-xs"> <ul class="dropdown-menu btn-xs">
<li><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0&itType=${itType}">查看</a></li> <li><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0&itType=${itType}"><spring:message code="show"/></a></li>
<shiro:hasPermission name="sys:dict:edit"> <shiro:hasPermission name="sys:dict:edit">
<li><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)">修改</a></li> <li><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)"><spring:message code="edit"/></a></li>
</shiro:hasPermission> </shiro:hasPermission>
<shiro:hasPermission name="sys:dict:edit"> <shiro:hasPermission name="sys:dict:edit">
<li><a href="${ctx}/basics/serviceDictInfo/delete?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)">删除</a></li> <li><a href="${ctx}/basics/serviceDictInfo/delete?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)"><spring:message code="delete"/></a></li>
</shiro:hasPermission> </shiro:hasPermission>
</ul> </ul>

20
src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp
View File

@@ -141,13 +141,13 @@
<div class="theme-panel hidden-xs hidden-sm"> <div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="history.go(-1)">返回</button> <button type="button" class="btn btn-default" onclick="history.go(-1)"><spring:message code="back"/></button>
</div> </div>
<h3 class="page-title"> <h3 class="page-title">
配置管理 <spring:message code="effect_range"/>
</h3> </h3>
<div class="row"> <div class="row">
@@ -155,7 +155,7 @@
<div class="portlet box blue"> <div class="portlet box blue">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption"> <div class="caption">
<i class="fa fa-gift"></i>配置<shiro:hasPermission name="sys:menu:edit">${not empty sysDictInfo.sysDictId?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit">查看</shiro:lacksPermission></div> <i class="fa fa-gift"></i><shiro:hasPermission name="sys:menu:edit">${not empty sysDictInfo.sysDictId?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit"><spring:message code="show"/></shiro:lacksPermission></div>
<div class="tools"> <div class="tools">
<!-- <a href="javascript:;" class="collapse"> </a> <!-- <a href="javascript:;" class="collapse"> </a>
<a href="#portlet-config" data-toggle="modal" class="config"> </a> <a href="#portlet-config" data-toggle="modal" class="config"> </a>
@@ -174,14 +174,14 @@
<form:hidden path="sysDictId"/> <form:hidden path="sysDictId"/>
<sys:message content="${message}"/> <sys:message content="${message}"/>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">上级配置:</label> <label class="col-md-3 control-label"><spring:message code="superior_config"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<sys:treeselect id="sysDictInfo" name="parent.sysDictId" value="${sysDictInfo.parent.sysDictId}" labelName="parent.itemValue" labelValue="${sysDictInfo.parent.itemValue eq '根节点'?'根节点':fns:getSysDictInfoById(sysDictInfo.parent.sysDictId).itemValue}" <sys:treeselect id="sysDictInfo" name="parent.sysDictId" value="${sysDictInfo.parent.sysDictId}" labelName="parent.itemValue" labelValue="${sysDictInfo.parent.itemValue eq '根节点'?'根节点':fns:getSysDictInfoById(sysDictInfo.parent.sysDictId).itemValue}"
title="菜单" url="/basics/sysDictInfo/treeData?itType=${itType}" extId="${sysDictInfo.sysDictId}" cssClass="required form-control"/> title="菜单" url="/basics/sysDictInfo/treeData?itType=${itType}" extId="${sysDictInfo.sysDictId}" cssClass="required form-control"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label radio-lable"><font color="red">*</font> 数据类型:</label> <label class="col-md-3 control-label radio-lable"><font color="red">*</font> <spring:message code="item_type"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<select id="itemType" name="itemType" class="form-control"> <select id="itemType" name="itemType" class="form-control">
<c:forEach items="${fns:getDictList('SYS_DICT_ITM_TYPE')}" var="dict"> <c:forEach items="${fns:getDictList('SYS_DICT_ITM_TYPE')}" var="dict">
@@ -203,13 +203,13 @@
</div> </div>
</div> --%> </div> --%>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>配置内容:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code="config_content"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<form:input path="itemValue" htmlEscape="false" maxlength="2000" class="form-control"/> <form:input path="itemValue" htmlEscape="false" maxlength="2000" class="form-control"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>是否为叶子节点:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<%-- <form:radiobuttons path="isLeaf" items="${fns:getDictOption('SYS_YES_NO')}" /> --%> <%-- <form:radiobuttons path="isLeaf" items="${fns:getDictOption('SYS_YES_NO')}" /> --%>
<form:select path="isLeaf" class="form-control"> <form:select path="isLeaf" class="form-control">
@@ -218,7 +218,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">描述信息:</label> <label class="col-md-3 control-label"><spring:message code="desc"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<form:textarea path="itemDesc" htmlEscape="false" maxlength="2000" class="form-control"/> <form:textarea path="itemDesc" htmlEscape="false" maxlength="2000" class="form-control"/>
</div> </div>
@@ -226,8 +226,8 @@
<div class="form-actions"> <div class="form-actions">
<div class="row"> <div class="row">
<div class="col-md-offset-3 col-md-9"> <div class="col-md-offset-3 col-md-9">
<shiro:hasPermission name="sys:menu:edit"><button type="submit" class="btn btn-circle blue">保存</button></shiro:hasPermission> <shiro:hasPermission name="sys:menu:edit"><button type="submit" class="btn btn-circle blue"><spring:message code="submit"/></button></shiro:hasPermission>
<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)">Cancel</button> <button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"/></button>
</div> </div>
</div> </div>
</div> </div>

24
src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
View File

@@ -39,11 +39,11 @@
<div class="theme-panel hidden-xs hidden-sm"> <div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="location='${ctx}/basics/sysDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button> <button type="button" class="btn btn-default" onclick="location='${ctx}/basics/sysDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>
<button type="button" class="btn btn-primary" <button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/basics/sysDictInfo/form?itType=${itType}'">新增配置</button> onClick="javascript:window.location='${ctx}/basics/sysDictInfo/form?itType=${itType}'"><spring:message code="add"/></button>
</div> </div>
<h3 class="page-title"> <h3 class="page-title">
配置管理 <spring:message code="effect_range"/>
</h3> </h3>
<div class="row"> <div class="row">
@@ -51,7 +51,7 @@
<div class="portlet box blue"> <div class="portlet box blue">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption"> <div class="caption">
<i class="fa fa-cogs"></i>列表信息 <i class="fa fa-cogs"></i><spring:message code="date_list"/>
</div> </div>
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
@@ -62,11 +62,11 @@
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/> <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/> <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<div class="col-md-12"> <div class="col-md-12">
<label class="search-lable">配置内容:</label><input id="itemValue" name="itemValue" type="text" maxlength="25" class="input-medium" value="${sysDictInfo.itemValue}"/> <label class="search-lable"><spring:message code="config_content"/>:</label><input id="itemValue" name="itemValue" type="text" maxlength="25" class="input-medium" value="${sysDictInfo.itemValue}"/>
<label class="search-lable">配置编码:</label><input id="itemCode" name="itemCode" type="text" maxlength="25" class="input-medium" value="${sysDictInfo.itemCode}"/> <label class="search-lable"><spring:message code="item_code"/>:</label><input id="itemCode" name="itemCode" type="text" maxlength="25" class="input-medium" value="${sysDictInfo.itemCode}"/>
<label class="search-lable itemType">数据类型:</label> <label class="search-lable itemType"><spring:message code="item_value"/>:</label>
<select id="itemType" name="itemType" > <select id="itemType" name="itemType" >
<option value="" selected="selected">-请选择-</option> <option value="" selected="selected"><spring:message code="select"/></option>
<c:forEach items="${fns:getDictList('SYS_DICT_ITM_TYPE')}" var="dict"> <c:forEach items="${fns:getDictList('SYS_DICT_ITM_TYPE')}" var="dict">
<c:forEach items="${intArr}" var="itTemp"> <c:forEach items="${intArr}" var="itTemp">
<c:if test="${dict.itemCode eq itTemp}"> <c:if test="${dict.itemCode eq itTemp}">
@@ -88,7 +88,7 @@
</div> </div>
</form:form> </form:form>
<table id="treeTable" class="table table-striped table-bordered table-condensed"> <table id="treeTable" class="table table-striped table-bordered table-condensed">
<thead><tr><th>配置内容</th><th>配置编码</th><th>描述信息</th><th>数据类型</th><th>叶子节点</th><th>创建人员</th><th>创建时间</th><th>最近修改人员</th><th>最近修改时间</th><shiro:hasPermission name="sys:menu:edit"><th>操作</th></shiro:hasPermission></tr></thead> <thead><tr><th><spring:message code="config_content"/></th><th><spring:message code="item_code"/></th><th><spring:message code="desc"/></th><th><spring:message code="item_type"/></th><th><spring:message code="is_leaf"/></th><th><spring:message code="creator"/></th><th><spring:message code="create_time"/></th><th><spring:message code="editor"/></th><th><spring:message code="edit_time"/></th><shiro:hasPermission name="sys:menu:edit"><th><spring:message code="operation"/></th></shiro:hasPermission></tr></thead>
<tbody><c:forEach items="${list}" var="sysDictInfo"> <tbody><c:forEach items="${list}" var="sysDictInfo">
<tr id="${sysDictInfo.sysDictId}" pId="${sysDictInfo.parent.sysDictId ne 0?sysDictInfo.parent.sysDictId:0}"> <tr id="${sysDictInfo.sysDictId}" pId="${sysDictInfo.parent.sysDictId ne 0?sysDictInfo.parent.sysDictId:0}">
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemValue}</a></td> <td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemValue}</a></td>
@@ -106,14 +106,14 @@
<td><fmt:formatDate value="${sysDictInfo.editTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td> <td><fmt:formatDate value="${sysDictInfo.editTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<td> <td>
<div class="btn-group btn-xs"> <div class="btn-group btn-xs">
<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a> <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"/><span class="caret"></span></a>
<ul class="dropdown-menu btn-xs"> <ul class="dropdown-menu btn-xs">
<li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0&itType=${itType}">查看</a></li> <li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0&itType=${itType}"><spring:message code="show"/></a></li>
<shiro:hasPermission name="sys:dict:edit"> <shiro:hasPermission name="sys:dict:edit">
<li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)">修改</a></li> <li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)"><spring:message code="edit"/></a></li>
</shiro:hasPermission> </shiro:hasPermission>
<shiro:hasPermission name="sys:dict:edit"> <shiro:hasPermission name="sys:dict:edit">
<li><a href="${ctx}/basics/sysDictInfo/delete?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)">删除</a></li> <li><a href="${ctx}/basics/sysDictInfo/delete?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)"><spring:message code="delete"/></a></li>
</shiro:hasPermission> </shiro:hasPermission>
</ul> </ul>

8
src/main/webapp/WEB-INF/views/cfg/requestList.jsp
View File

@@ -122,8 +122,14 @@
<c:when test="${requestInfo.isAudit eq '1'}"> <c:when test="${requestInfo.isAudit eq '1'}">
<li><a href="${ctx}/cfg/request/requestCancelExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="cancel"></spring:message></a></li> <li><a href="${ctx}/cfg/request/requestCancelExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="cancel"></spring:message></a></li>
</c:when> </c:when>
<c:when test="${requestInfo.isAudit ne '2'}">
<li><a href="${ctx}/cfg/request/requestExamineNo?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="unapproved"></spring:message></a></li>
<li><a href="${ctx}/cfg/request/requestExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="approved"></spring:message></a></li>
<li><a href="${ctx}/cfg/request/form?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="edit"></spring:message></a></li>
<li><a href="${ctx}/cfg/request/delete?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="delete"></spring:message></a></li>
</c:when>
<c:otherwise> <c:otherwise>
<li><a href="${ctx}/cfg/request/requestExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="examine"></spring:message></a></li> <li><a href="${ctx}/cfg/request/requestExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="approved"></spring:message></a></li>
<li><a href="${ctx}/cfg/request/form?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="edit"></spring:message></a></li> <li><a href="${ctx}/cfg/request/form?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="edit"></spring:message></a></li>
<li><a href="${ctx}/cfg/request/delete?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="delete"></spring:message></a></li> <li><a href="${ctx}/cfg/request/delete?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="delete"></spring:message></a></li>
</c:otherwise> </c:otherwise>

6
src/main/webapp/WEB-INF/views/login.jsp
View File

@@ -22,6 +22,7 @@
<link href="${pageContext.request.contextPath}/static/global/plugins/simple-line-icons/simple-line-icons.min.css" rel="stylesheet" type="text/css" /> <link href="${pageContext.request.contextPath}/static/global/plugins/simple-line-icons/simple-line-icons.min.css" rel="stylesheet" type="text/css" />
<link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" /> <link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
<link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-switch/css/bootstrap-switch.min.css" rel="stylesheet" type="text/css" /> <link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-switch/css/bootstrap-switch.min.css" rel="stylesheet" type="text/css" />
<link href="${pageContext.request.contextPath}/static/global/plugins/jquery-validation/1.11.0/jquery.validate.min.css" type="text/css" rel="stylesheet" />
<!-- END GLOBAL MANDATORY STYLES --> <!-- END GLOBAL MANDATORY STYLES -->
<!-- BEGIN THEME GLOBAL STYLES --> <!-- BEGIN THEME GLOBAL STYLES -->
<link href="${pageContext.request.contextPath}/static/global/css/components.min.css" rel="stylesheet" id="style_components" type="text/css" /> <link href="${pageContext.request.contextPath}/static/global/css/components.min.css" rel="stylesheet" id="style_components" type="text/css" />
@@ -106,6 +107,9 @@
<script src="${pageContext.request.contextPath}/static/global/plugins/jquery-slimscroll/jquery.slimscroll.min.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/jquery-slimscroll/jquery.slimscroll.min.js" type="text/javascript"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/jquery.blockui.min.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/jquery.blockui.min.js" type="text/javascript"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-switch/js/bootstrap-switch.min.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-switch/js/bootstrap-switch.min.js" type="text/javascript"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/jquery-validation/1.11.0/jquery.validate.min.js" type="text/javascript"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js" type="text/javascript"></script>
<!-- END CORE PLUGINS --> <!-- END CORE PLUGINS -->
<!-- BEGIN THEME GLOBAL SCRIPTS --> <!-- BEGIN THEME GLOBAL SCRIPTS -->
<script src="${pageContext.request.contextPath}/static/global/scripts/app.min.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/static/global/scripts/app.min.js" type="text/javascript"></script>
@@ -133,8 +137,6 @@
} }
}); });
// 如果在框架或在对话框中，则弹出提示并跳转到首页 // 如果在框架或在对话框中，则弹出提示并跳转到首页
if(self.frameElement && self.frameElement.tagName == "IFRAME" || $('#left').length > 0 || $('.jbox').length > 0){ if(self.frameElement && self.frameElement.tagName == "IFRAME" || $('#left').length > 0 || $('.jbox').length > 0){
alert('未登录或登录超时。请重新登录，谢谢！'); alert('未登录或登录超时。请重新登录，谢谢！');