IP地址取消来函增加取消来函信息添加,展示

This commit is contained in:
zhanghongqing
2018-10-22 19:15:21 +08:00
parent a389258e64
commit 1e10aeb14f
16 changed files with 296 additions and 15 deletions

View File

@@ -199,7 +199,107 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;
}
top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='info'/>",function(v,h,f){
if((url.indexOf("?isAudit=3") > 1)){
// 审核中区分是否有添加取消来函
var reobj=JSON.parse(JSON.stringify("${page.list[0]}"));
var indexTableNameArr=reobj.match(/indexTable=(\w*),/);
var requestNameArr=reobj.match(/requestName=(\w*),/);
// 有来函业务的取消审核
if(reobj!=null&&reobj.indexOf("requestName")!=-1&&requestNameArr!=null&&requestNameArr.length>1&&indexTableNameArr!=null&&indexTableNameArr.length>1){
var indexTableName =indexTableNameArr[1];
var requestName =requestNameArr[1];
if(requestName.indexOf("null")==-1&&typeof(indexTableName)!="undefined"&&indexTableName!=null&&indexTableName!=''&&indexTableName.indexOf("null")==-1){
$.jBox.open("iframe:${ctx}/basics/serviceDictInfo/requestSelectInfo", "取消审核通过", 400, 500, { buttons: { '确定': 1, '取消': 0 },
submit: function (v, h, f) {
if (v == 0) {
return true; // close the window
} else {
h.find('.errorBlock').hide('fast', function () { $(this).remove(); });
var cancelRequestId = h.find("iframe")[0].contentWindow.requestIsAudit.value;
if (!cancelRequestId) {
$('<div class="errorBlock" style="display: none;font-size:18px;color:red;text-align:center;margin-top:10px">请选择来函信息!</div>').prependTo(h).show('fast');
return false;
}
if(url.indexOf("?")>0){
$.ajax({
type:'post',
url:'${ctx}/basics/serviceDictInfo/requestCancleInfoAjax',
data:{"cancelRequestId":cancelRequestId,"ids":ids,"indexTable":indexTableName},
async:false,
success:function(data,textStatus){//处理返回结果
window.location = url+"&ids="+ids+"&compileIds="+compileIds;
}
});
}else{
window.location = url+"?ids="+ids+"&compileIds="+compileIds;
}
if(url.indexOf("?isAudit") > 1){
loading('<spring:message code="onloading"/>');
}else if(url.indexOf("export") > 1){
closeTip();
}
//$("#searchForm").submit();
top.$.jBox.tip("审核---"+(cancelRequestId), "<spring:message code='info'/>");
}
return true;
},
loaded:function(h){
$(".jbox-content,top.document").css("overflow-y","hidden")
$(".jbox-content,top.document.children").css("clear","both")
$(".jbox-content,top.document.children").css("z-index","999999")
$(".jbox-content,top.document.children").css("overflow;","auto")
$(".jbox-content,top.document").css("width","90%")
}
});
}else{
// 防止有来函无表名的取消审核操作
top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='info'/>",function(v,h,f){
if(v=="ok"){
if(url.indexOf("?")>0){
window.location = url+"&ids="+ids+"&compileIds="+compileIds;
}else{
window.location = url+"?ids="+ids+"&compileIds="+compileIds;
}
if(url.indexOf("?isAudit") > 1){
loading('<spring:message code="onloading"/>');
}else if(url.indexOf("export") > 1){
closeTip();
}
//$("#searchForm").submit();
}
},{buttonsFocus:1});
top.$('.jbox-body .jbox-icon').css('top','55px');
}
}else{
// 无来函选项的取消审核操作
top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='info'/>",function(v,h,f){
if(v=="ok"){
if(url.indexOf("?")>0){
window.location = url+"&ids="+ids+"&compileIds="+compileIds;
}else{
window.location = url+"?ids="+ids+"&compileIds="+compileIds;
}
if(url.indexOf("?isAudit") > 1){
loading('<spring:message code="onloading"/>');
}else if(url.indexOf("export") > 1){
closeTip();
}
//$("#searchForm").submit();
}
},{buttonsFocus:1});
top.$('.jbox-body .jbox-icon').css('top','55px');
}
//除取消审核之外的业务
}else{
top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='info'/>",function(v,h,f){
if(v=="ok"){
if(url.indexOf("?")>0){
@@ -216,7 +316,7 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
}
},{buttonsFocus:1});
top.$('.jbox-body .jbox-icon').css('top','55px');
}
}
//验证选择的配置,是否可删除或者审核未通过或者审核通过,只有未审核的配置可删除或审核未通过或审核通过
function validateAllNoAudit(checkboxes){

View File

@@ -0,0 +1,32 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<script type="text/javascript">
function changesel(){
if($("#requestIsAudit").val()!=''&&$("#requestIsAudit").val()!=null){
$(".errorBlock").hide()
}
}
</script>
<div class="row"
style="scrolling:auto;z-index:999;position:relative;height: 25px; font-size: 18px; text-align: center; margin-top: 30px; margin-left: 20px; line-height: 30px;">
<div class="col-md-8">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font> 来函 </label>
<div class="col-md-6">
<select id="requestIsAudit" name="requestId" onchange="changesel()"
class="selectpicker field required form-control" data-live-search="true"
data-live-search-placeholder="search">
<option value=""><spring:message code="select" /></option>
<c:forEach items="${requestInfos}" var="requestInfo">
<option value="${requestInfo.id}"><spring:message
code="${requestInfo.requestTitle}"></spring:message></option>
</c:forEach>
</select>
</div>
</div>
</div>
</div>
<!--/row-->

View File

@@ -465,7 +465,9 @@
<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
<c:when test="${indexCfg.isAudit eq '3'}">
<span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span>
</c:when>
</c:choose>
</td>
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>