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

修改专项任务和来函权限按钮展示以及列表展示权限用户下的数据

Browse Source 
修改特定服务bug
This commit is contained in:
duandongmei
2018-07-16 14:21:21 +08:00
parent 60b3a1ae34
commit 1ebb1437ff
16 changed files with 146 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp
View File

@@ -9,10 +9,6 @@
<div class="page-content">
<div class="row">
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="history.go(-1)"><spring:message code="back"/></button>
</div>
<h3 class="page-title">
<spring:message code="special_task"/>
</h3>
@@ -30,21 +26,21 @@
<input type="hidden" name="id" value="${taskInfo.id}"/>
<div class="form-body">
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="task_name"></spring:message>:</label>
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="task_name"></spring:message>:</label>
<div class="col-md-4">
<input type="text" class="form-control" name="taskName" value="${taskInfo.taskName}">
<input type="text" class="form-control required" name="taskName" value="${taskInfo.taskName}">
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="task_org"></spring:message>:</label>
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="task_org"></spring:message>:</label>
<div class="col-md-4">
<input type="text" class="form-control" name="taskOrg" value="${taskInfo.taskOrg}">
<input type="text" class="form-control required" name="taskOrg" value="${taskInfo.taskOrg}">
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="task_time"></spring:message>:</label>
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="task_time"></spring:message>:</label>
<div class="col-md-4">
<input id="taskTime" name="taskTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate"
<input id="taskTime" name="taskTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate required"
value="<fmt:formatDate value="${taskInfo.taskTime}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
</div>
</div>
@@ -84,46 +80,13 @@
<script type="text/javascript">
$(document).ready(function() {
$("#inputForm").validate({
rules: {
taskName: {
required: true,
maxlength:64,
$("#inputForm").validate({
submitHandler: function(form){
loading('onloading...');
form.submit();
},
taskOrg: {
required: true,
maxlength:128,
},
taskTime: {
required: true,
},
taskDesc: {
maxlength:512,
},
},
messages: {
taskName: {
required: '<spring:message code="required"/>',
maxlength: '<spring:message code="maxlength_64"/>',
},
taskOrg: {
required: '<spring:message code="required"/>',
maxlength: '<spring:message code="maxlength_128"/>',
},
taskTime: {
required: '<spring:message code="required"/>',
},
taskDesc: {
maxlength: '<spring:message code="maxlength_512"/>',
},
},
submitHandler: function(form){
//loading('onloading...');
form.submit();
},
errorContainer: "#messageBox",
});
errorContainer: "#messageBox",
});
});
</script>
</body>

26
src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
View File

@@ -9,14 +9,34 @@
<body>
<div class="page-content">
<c:set var ="isOptator" value="false"></c:set>
<c:set var ="isConfirmor" value="false"></c:set>
<c:set var ="isAuditor" value="false"></c:set>
<c:forEach items="${fns:getUser().userRoleList}" var="role">
<c:if test="${role.id ==28}">
<c:set var ="isAuditor" value="true"></c:set>
</c:if>
<c:if test="${role.id ==27}">
<c:set var ="isConfirmor" value="true"></c:set>
</c:if>
<c:if test="${role.id ==26}">
<c:set var ="isOptator" value="true"></c:set>
</c:if>
<c:if test="${role.id ==1}">
<c:set var ="isOptator" value="true"></c:set>
<c:set var ="isConfirmor" value="true"></c:set>
<c:set var ="isAuditor" value="true"></c:set>
</c:if>
</c:forEach>
<shiro:hasPermission name="basics:taskInfo:edit">
<c:if test="${isOptator }">
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="javascript:window.location='${ctx}/basics/taskInfo/list'"><spring:message code="refresh"></spring:message></button>
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/basics/taskInfo/form'">
<i class="fa fa-plus"></i>
<spring:message code="add"/></button>
</div>
</c:if>
</shiro:hasPermission>
<h3 class="page-title">
<spring:message code="special_task"></spring:message>
@@ -66,11 +86,14 @@
<div class="pull-right">
<shiro:hasPermission name="basics:taskInfo:edit">
<c:if test="${isOptator }">
<button type="button" class="btn btn-default" onclick="edit()">
<i class="fa fa-edit"></i> <spring:message code="edit"></spring:message></button>
<sys:delRow url="${ctx}/basics/taskInfo/delete" id="contentTable" label="delete"></sys:delRow>
<!-- <button type="button" class="btn btn-default">
<i class="fa fa-download"></i> 导出</button> -->
</c:if>
<c:if test="${isConfirmor }">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
@@ -82,6 +105,7 @@
<li><sys:delRow url="${ctx}/basics/taskInfo/taskCancelExamine" id="contentTable" label="cancelPass"></sys:delRow></li>
</ul>
</div>
</c:if>
</shiro:hasPermission>
<a class="btn btn-icon-only btn-default setfields tooltips"
data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">

10
src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
View File

@@ -23,19 +23,19 @@
<input type="hidden" name="id" value="${requestInfo.id}"/>
<div class="form-body">
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="request_number"></spring:message>:</label>
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="request_number"></spring:message>:</label>
<div class="col-md-4">
<input type="text" class="form-control required" maxlength="64" name="requestNumber" value="${requestInfo.requestNumber}">
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="request_organization"></spring:message>:</label>
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="request_organization"></spring:message>:</label>
<div class="col-md-4">
<input type="text" class="form-control required" maxlength="128" name="requestOrg" value="${requestInfo.requestOrg}">
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="request_time"></spring:message>:</label>
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="request_time"></spring:message>:</label>
<div class="col-md-4">
<input id="requestTime" name="requestTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate required"
value="<fmt:formatDate value="${requestInfo.requestTime}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
@@ -48,7 +48,7 @@
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="content"></spring:message>:</label>
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="content"></spring:message>:</label>
<div class="col-md-4">
<input type="text" class="form-control required" name="requestContent" maxlength="4000" value="${requestInfo.requestContent}">
</div>
@@ -86,7 +86,7 @@
$("#inputForm").validate({
submitHandler: function(form){
//loading('onloading...');
loading('onloading...');
form.submit();
},
errorContainer: "#messageBox",

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

@@ -9,13 +9,34 @@
<body>
<div class="page-content">
<c:set var ="isOptator" value="false"></c:set>
<c:set var ="isConfirmor" value="false"></c:set>
<c:set var ="isAuditor" value="false"></c:set>
<c:forEach items="${fns:getUser().userRoleList}" var="role">
<c:if test="${role.id ==28}">
<c:set var ="isAuditor" value="true"></c:set>
</c:if>
<c:if test="${role.id ==27}">
<c:set var ="isConfirmor" value="true"></c:set>
</c:if>
<c:if test="${role.id ==26}">
<c:set var ="isOptator" value="true"></c:set>
</c:if>
<c:if test="${role.id ==1}">
<c:set var ="isOptator" value="true"></c:set>
<c:set var ="isConfirmor" value="true"></c:set>
<c:set var ="isAuditor" value="true"></c:set>
</c:if>
</c:forEach>
<shiro:hasPermission name="cfg:requestInfo:edit">
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-primary"
<c:if test="${isOptator }">
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/cfg/request/form'">
<i class="fa fa-plus"></i>
<spring:message code="add"/></button>
</div>
</div>
</c:if>
</shiro:hasPermission>
<h3 class="page-title">
<spring:message code="requestInfo"></spring:message>
@@ -73,22 +94,26 @@
<div class="pull-right">
<shiro:hasPermission name="cfg:requestInfo:edit">
<c:if test="${isOptator }">
<button type="button" class="btn btn-default" onClick="edit()">
<i class="fa fa-edit"></i> <spring:message code="edit"></spring:message></button>
<sys:delRow url="${ctx}/cfg/request/delete" id="contentTable" label="delete"></sys:delRow>
<!-- <button type="button" class="btn btn-default">
<i class="fa fa-download"></i> 导出</button> -->
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
<i class="fa fa-angle-down"></i>
</button>
<ul class="dropdown-menu pull-right">
<li><sys:delRow url="${ctx}/cfg/request/requestExamine" id="contentTable" label="approved"></sys:delRow></li>
<li><sys:delRow url="${ctx}/cfg/request/requestExamineNo" id="contentTable" label="unapproved"></sys:delRow></li>
<li><sys:delRow url="${ctx}/cfg/request/requestCancelExamine" id="contentTable" label="cancelPass"></sys:delRow></li>
</ul>
</div>
</c:if>
<c:if test="${isConfirmor }">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
<i class="fa fa-angle-down"></i>
</button>
<ul class="dropdown-menu pull-right">
<li><sys:delRow url="${ctx}/cfg/request/requestExamine" id="contentTable" label="approved"></sys:delRow></li>
<li><sys:delRow url="${ctx}/cfg/request/requestExamineNo" id="contentTable" label="unapproved"></sys:delRow></li>
<li><sys:delRow url="${ctx}/cfg/request/requestCancelExamine" id="contentTable" label="cancelPass"></sys:delRow></li>
</ul>
</div>
</c:if>
</shiro:hasPermission>
<a class="btn btn-icon-only btn-default setfields tooltips"
data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">

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

@@ -42,7 +42,7 @@
<img src="${pageContext.request.contextPath}/static/pages/img/logo.png" alt="logo" />
</div>
<div class="page-body">
<div class="login-head"> Login </div>
<div class="login-head"> <spring:message code='login'/> </div>
<div class="login-body">
<div class="pull-left login-avatar-block">
<img src="${pageContext.request.contextPath}/static/pages/img/photo.jpg" class="login-avatar"> </div>
@@ -67,7 +67,7 @@
</li> --%>
<div class="form-actions">
<button type="submit" class="btn red uppercase">Login</button>
<button type="submit" class="btn red uppercase"><spring:message code='login'/></button>
</div>
</form>
</div>
@@ -80,7 +80,6 @@
<p>
<div id="messageBox" class="alert alert-danger ${empty message ? 'hide' : ''}">
<span class="label label-danger">ERROR:&nbsp;&nbsp;</span>
<label id="loginError" class="error"><spring:message code="${message}"></spring:message></label>
</div>
</p>

4
src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
View File

@@ -160,12 +160,10 @@
<div class="input-group">
<div class="input-group-btn">
<select id="seltype" class="selectpicker select2 input-middle" >
<option value="specServiceCode"><spring:message code="protocol_code"/></option>
<option value="specServiceName"><spring:message code="protocol_name"/></option>
<option value="groupId"><spring:message code="group_id"/></option>
</select>
</div>
<input id="intype" class="form-control input-medium" placeholder="<spring:message code='input_protocol_code'/>" type="text" onchange="casec()" maxlength="60">
<input id="intype" class="form-control input-medium" placeholder="<spring:message code='input'/><spring:message code='protocol_code'/>" type="text" onchange="casec()" maxlength="60">
</div>