1.增加列表缺少字段导出相应修改 2.增加分组域配置批量删除功能 3.修复分组域配置导入不下发bug

This commit is contained in:
zhangwenqing
2019-06-19 16:15:21 +08:00
parent 5f7eb1ec43
commit bb13d8bbec
26 changed files with 882 additions and 92 deletions

View File

@@ -113,8 +113,14 @@
top.$('.jbox-body .jbox-icon').css('top','55px');
}else{
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;
top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='delete_all'/>",function(v,h,f){
if(v=="ok"){
$("#searchForm").attr("action",url);
page();
}
});
/* top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return; */
}
}
@@ -265,9 +271,10 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th column="config_describe" ><spring:message code="config_describe"/></th>
<th class="sort-column r.cfg_desc" column="config_describe" ><spring:message code="config_describe"/></th>
<th class="sort-column r.group_id" column="groupId"><spring:message code="group_name"/></th>
<th class="sort-column cfg_keywords"><spring:message code="key_word"/></th>
<th column="expression_type" ><spring:message code="expression_type"/></th>
<th column="match_method" ><spring:message code="match_method"/></th>
<th column="creator" ><spring:message code="creator"/></th>
<th column="config_time" class="sort-column create_time"><spring:message code="config_time"/></th>
@@ -288,6 +295,13 @@
</c:forEach>
</td>
<td>${cfg.cfgKeywords }</td>
<td>
<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
<c:if test="${exprTypeC.itemCode eq cfg.exprType}">
<spring:message code="${exprTypeC.itemValue}"/>
</c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<c:if test="${matchMethodC.itemCode eq cfg.matchMethod}">