(1)修复IP类PZ查询条件值为0时后台没有传值的bug
(2)调整调整PZ入库的分类,性质,标签的字段,由ITEM_CODE 改为 service_dict_id
This commit is contained in:
@@ -28,20 +28,20 @@
|
||||
<c:forEach items="${fls}" var="fl">
|
||||
<c:choose>
|
||||
<c:when test="${_cfg.classify==null or _cfg.classify==''}">
|
||||
<option value="${fl.itemCode}">${fl.itemValue}</option>
|
||||
<option value="${fl.serviceDictId}">${fl.itemValue}</option>
|
||||
</c:when>
|
||||
<c:when test="${fn:contains(_cfg.classify,',')}">
|
||||
<option value="${fl.itemCode}"
|
||||
<option value="${fl.serviceDictId}"
|
||||
<c:forEach items="${fn:split(_cfg.classify,',')}" var="_classify">
|
||||
<c:if test="${fl.isValid==0}">disabled="disabled"</c:if>
|
||||
<c:if test="${fl.itemCode==_classify}">selected</c:if>
|
||||
<c:if test="${fn:trim(fl.serviceDictId) eq _classify}">selected</c:if>
|
||||
</c:forEach>
|
||||
>${fl.itemValue}</option>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<option value="${fl.itemCode}"
|
||||
<option value="${fl.serviceDictId}"
|
||||
<c:if test="${fl.isValid==0}">disabled="disabled"</c:if>
|
||||
<c:if test="${fl.itemCode==_classify}">selected</c:if>
|
||||
<c:if test="${fn:trim(fl.serviceDictId) eq _classify}">selected</c:if>
|
||||
>${fl.itemValue}</option>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
@@ -62,13 +62,13 @@
|
||||
<c:forEach items="${xzs}" var="xz">
|
||||
<c:choose>
|
||||
<c:when test="${_cfg.attribute==null or _cfg.attribute==''}">
|
||||
<option value="${xz.itemCode}">${xz.itemValue}</option>
|
||||
<option value="${xz.serviceDictId}">${xz.itemValue}</option>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<c:forEach items="${fn:split(_cfg.attribute,',')}" var="_attribute">
|
||||
<option value="${xz.itemCode}"
|
||||
<option value="${xz.serviceDictId}"
|
||||
<c:if test="${xz.isValid==0}">disabled="disabled"</c:if>
|
||||
<c:if test="${xz.itemCode==_attribute}">selected</c:if>
|
||||
<c:if test="${fn:trim(xz.serviceDictId) eq _attribute}">selected</c:if>
|
||||
>${xz.itemValue}</option>
|
||||
</c:forEach>
|
||||
</c:otherwise>
|
||||
@@ -86,13 +86,13 @@
|
||||
<c:forEach items="${lables}" var="lable">
|
||||
<c:choose>
|
||||
<c:when test="${_cfg.lable==null or _cfg.lable==''}">
|
||||
<option value="${lable.itemCode}">${lable.itemValue}</option>
|
||||
<option value="${lable.serviceDictId}">${lable.itemValue}</option>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<c:forEach items="${fn:split(_cfg.lable,',')}" var="_lable">
|
||||
<option value="${lable.itemCode}"
|
||||
<option value="${lable.serviceDictId}"
|
||||
<c:if test="${lable.isValid==0}">disabled="disabled"</c:if>
|
||||
<c:if test="${lable.itemCode==_lable}">selected</c:if>
|
||||
<c:if test="${fn:trim(lable.serviceDictId) eq _lable}">selected</c:if>
|
||||
>${lable.itemValue}</option>
|
||||
</c:forEach>
|
||||
</c:otherwise>
|
||||
|
||||
Reference in New Issue
Block a user